Fix view mode beaking on iOS when opening Look and feel page

This commit is contained in:
Michael Zanetti 2019-12-26 14:49:46 +01:00
parent 583cd927b8
commit 19e553bfba

View File

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