android fix - sidebar and advanced menu back / open button conflict

OpenHD · Feb 19, 2024 · 3c4465a · 3c4465a
1 parent 3035121
commit 3c4465a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml
@@ -247,6 +247,10 @@ Item {
         anchors.leftMargin: 8
         anchors.top: parent.top
         anchors.topMargin: 0
+        // If the sidebar is activated, do not show the (button/image) that opens the advanced menu
+        // since on devices with a funky ratio (e.g. extra wide, like most modern android phones)
+        // the back button of the sidebar and this button conflict
+        visible: !sidebar.m_extra_is_visible
 
         MouseArea {
             id: settingsButtonMouseArea

diff --git a/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml b/qml/ui/configpopup/openhd_settings/ChooseResolutionDialoque.qml
@@ -27,16 +27,10 @@ Card {
     property bool argh_is_changing_model:false;
     ListModel{
         id: resolutions_model
-        //ListElement {title: "0x0@0   (AUTO)"; value: "0x0@0"}
-        //ListElement {title: "480p@30fps  (4:3)"; value: "640x480@30"}
+        // NOTE: elements are overridden when we know the camera
         ListElement {title: "480p@60fps  (4:3)"; value: "640x480@60"}
-        //ListElement {title: "480p@60fps  (16:9)"; value: "848x480@60"}
-        //ListElement {title: "720p@49fps  (16:9)"; value: "1280x720@49"}
-        //ListElement {title: "720p@60fps  (4:3)"; value: "960x720@60"}
         ListElement {title: "720p@60fps  (16:9)"; value: "1280x720@60"}
         ListElement {title: "1080p@30fps (16:9)"; value: "1920x1080@30"}
-        //ListElement {title: "1080p@30fps (4:3)"; value: "1440x1080@30"}
-        //ListElement {title: "1080p@49fps (4:3)"; value: "1440x1080@49"}
     }
 
     function close(){