remove dumb merge

OpenHD · Nov 17, 2023 · 2b62a20 · 2b62a20 · raphaelscholle · Nov 17, 2023
2 parents c633fd5 + b3518ae
commit 2b62a20
Show file tree

Hide file tree

Showing 3 changed files with 485 additions and 109 deletions.
diff --git a/qml/main.qml b/qml/main.qml
@@ -27,8 +27,15 @@ ApplicationWindow {
 
     //width: 850
     //height: 480
-    width: (settings.general_screen_rotation == 90 || settings.general_screen_rotation == 270) ? m_window_height : m_window_width
-    height: (settings.general_screen_rotation == 90 || settings.general_screen_rotation == 270) ? m_window_width : m_window_height
+    width: 1920
+    height: 1080
+
+    onWidthChanged: {
+        _qrenderstats.set_window_width(width)
+    }
+    onHeightChanged: {
+        _qrenderstats.set_window_height(height)
+    }
 
     onWidthChanged: {
         _qrenderstats.set_window_width(width)

diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml
@@ -292,9 +292,6 @@ Item {
         LinkUpRSSIWidget {
             id: uplink
         }
-        Sidebar{
-            id: sidebar
-        }
         // ----------------------------------------------------------------------------
         // TODO SORT ME
 
@@ -474,6 +471,9 @@ Item {
         UAVTimeWiget{
             id: uavtimewidget
         }
+        Sidebar{
+            id: sidebar
+        }
     }
 
     // Extra element - allows customizing the OSD color(s) and more