From 19e553bfba5fb8f63a921bb078a2d0753358fef7 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 26 Dec 2019 14:49:46 +0100 Subject: [PATCH] Fix view mode beaking on iOS when opening Look and feel page --- nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml b/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml index ce97b2df..f6eeac96 100644 --- a/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml +++ b/nymea-app/ui/appsettings/LookAndFeelSettingsPage.qml @@ -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; } } }