Merge branch 'gz-gui8' into gl_gamma

gazebosim · Jul 24, 2024 · ec83ca2 · ec83ca2
2 parents 8577d32 + 179f0e6
commit ec83ca2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/include/gz/gui/qml/Main.qml b/include/gz/gui/qml/Main.qml
@@ -189,8 +189,8 @@ ApplicationWindow
         contentItem: Image {
           fillMode: Image.Pad
           horizontalAlignment: Image.AlignHCenter
-          verticalAlignment: Image.AlignVCenter
-          source: "images/drawer.png"
+          verticalAlignment: Image.AlignVCenter 
+          source: Material.theme === Material.Light ? "images/drawer.png" : "images/drawer_dark.png"
         }
         onClicked: drawer.open()
       }
@@ -221,7 +221,7 @@ ApplicationWindow
           fillMode: Image.Pad
           horizontalAlignment: Image.AlignHCenter
           verticalAlignment: Image.AlignVCenter
-          source: "images/menu.png"
+          source: Material.theme === Material.Light ? "images/menu.png"  : "images/menu_dark.png"
         }
         onClicked: pluginMenu.open()
 

diff --git a/include/gz/gui/qml/images/drawer_dark.png b/include/gz/gui/qml/images/drawer_dark.png
diff --git a/include/gz/gui/qml/images/menu_dark.png b/include/gz/gui/qml/images/menu_dark.png
diff --git a/include/gz/gui/resources.qrc b/include/gz/gui/resources.qrc
@@ -24,7 +24,9 @@
 
   <file>qml/images/gazebo_logo.png</file>
   <file>qml/images/drawer.png</file>
+  <file>qml/images/drawer_dark.png</file>
   <file>qml/images/menu.png</file>
+  <file>qml/images/menu_dark.png</file>
   <file>qml/images/export_icon.png</file>
   <file>qml/images/search.svg</file>
   <file>qml/images/plottable_icon.svg</file>