ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #291: Fix view mode breaking on iOS when opening Look and feel page

Browse Source
This commit is contained in:
Jenkins nymea 2020-01-09 13:50:47 +01:00
commit 08478205e7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml
View File

@ -19,13 +19,13 @@ Page {
RowLayout {
Layout.fillWidth: true; Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.topMargin: app.margins
visible: !kioskMode
visible: !kioskMode && Qt.platform.os !== "ios"
Label {
Layout.fillWidth: true
text: qsTr("View mode")
}
ComboBox {
model: [qsTr("Windowed"), qsTr("Maximized"), qsTr("Fullscreen")]
model: [qsTr("Windowed"), qsTr("Maximized"), qsTr("Fullscreen"), qsTr("Automatic")]
currentIndex: {
switch (settings.viewMode) {
case ApplicationWindow.Windowed:
@ -34,6 +34,8 @@ Page {
return 1;
case ApplicationWindow.FullScreen:
return 2;
case ApplicationWindow.AutomaticVisibility:
return 3;
}
}
@ -47,6 +49,10 @@ Page {
break;
case 2:
settings.viewMode = ApplicationWindow.FullScreen;
break;
case 3:
settings.viewMode = ApplicationWindow.AutomaticVisibility;
break;
}
}
}