MyFrameMain: load dark/light icons depending on system appearance

bk138 · Oct 13, 2024 · c955ed8 · c955ed8
1 parent 82dc5b7
commit c955ed8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/gui/MyFrameMain.cpp b/src/gui/MyFrameMain.cpp
@@ -55,6 +55,7 @@ BEGIN_EVENT_TABLE(MyFrameMain, FrameMain)
 #if wxCHECK_VERSION(3, 1, 5)
   EVT_FULLSCREEN (MyFrameMain::onFullScreenChanged)
 #endif
+  EVT_SYS_COLOUR_CHANGED(MyFrameMain::onSysColourChanged)
 END_EVENT_TABLE()
 
 
@@ -690,6 +691,12 @@ void MyFrameMain::onFullScreenChanged(bool isFullScreen) {
 }
 
 
+void MyFrameMain::onSysColourChanged(wxSysColourChangedEvent& event)
+{
+    load_toolbar_icons();
+}
+
+
 
 void MyFrameMain::onVNCConnGetPasswordNotify(wxCommandEvent &event)
 {
@@ -1122,15 +1129,16 @@ void MyFrameMain::splitwinlayout()
 
 void MyFrameMain::load_toolbar_icons()
 {
-    GetToolBar()->FindById(wxID_YES)->SetNormalBitmap(bitmapBundleFromSVGResource("connect"));
-    GetToolBar()->FindById(wxID_REDO)->SetNormalBitmap(bitmapBundleFromSVGResource("listen"));
-    GetToolBar()->FindById(wxID_STOP)->SetNormalBitmap(bitmapBundleFromSVGResource("disconnect"));
-    GetToolBar()->FindById(ID_GRABKEYBOARD)->SetNormalBitmap(bitmapBundleFromSVGResource("toggle-keyboard-grab"));
-    GetToolBar()->FindById(wxID_SAVE)->SetNormalBitmap(bitmapBundleFromSVGResource("screenshot"));
-    GetToolBar()->FindById(ID_INPUT_RECORD)->SetNormalBitmap(bitmapBundleFromSVGResource("record"));
-    GetToolBar()->FindById(ID_INPUT_REPLAY)->SetNormalBitmap(bitmapBundleFromSVGResource("replay"));
-    GetToolBar()->FindById(ID_FULLSCREEN)->SetNormalBitmap(bitmapBundleFromSVGResource("fullscreen"));
-    GetToolBar()->FindById(ID_ONE_TO_ONE)->SetNormalBitmap(bitmapBundleFromSVGResource("one-to-one"));
+    wxString prefix = wxSystemSettings::GetAppearance().IsDark() ? "dark" : "light";
+    GetToolBar()->FindById(wxID_YES)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "connect"));
+    GetToolBar()->FindById(wxID_REDO)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/"  + "listen"));
+    GetToolBar()->FindById(wxID_STOP)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "disconnect"));
+    GetToolBar()->FindById(ID_GRABKEYBOARD)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "toggle-keyboard-grab"));
+    GetToolBar()->FindById(wxID_SAVE)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "screenshot"));
+    GetToolBar()->FindById(ID_INPUT_RECORD)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "record"));
+    GetToolBar()->FindById(ID_INPUT_REPLAY)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "replay"));
+    GetToolBar()->FindById(ID_FULLSCREEN)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "fullscreen"));
+    GetToolBar()->FindById(ID_ONE_TO_ONE)->SetNormalBitmap(bitmapBundleFromSVGResource(prefix + "/" + "one-to-one"));
 }
 
 

diff --git a/src/gui/MyFrameMain.h b/src/gui/MyFrameMain.h
@@ -89,6 +89,7 @@ class MyFrameMain: public FrameMain
 #else
   void onFullScreenChanged(bool isFullScreen);
 #endif
+  void onSysColourChanged(wxSysColourChangedEvent& event);
 
   bool saveStats(VNCConn* c, int conn_index, const wxArrayString& stats, wxString desc, bool autosave);
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,7 @@ class MyFrameMain: public FrameMain @@
     #else
       void onFullScreenChanged(bool isFullScreen);
     #endif
+      void onSysColourChanged(wxSysColourChangedEvent& event);
       bool saveStats(VNCConn* c, int conn_index, const wxArrayString& stats, wxString desc, bool autosave);
@@ Expand Down @@