diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp index 9c986ce7e..718480151 100644 --- a/uppsrc/CtrlCore/Ctrl.cpp +++ b/uppsrc/CtrlCore/Ctrl.cpp @@ -463,12 +463,12 @@ String Desc(const Ctrl *ctrl) s << " \"" << q << '\"'; const Ctrl *top = ctrl->GetTopWindow(); if(top && top != ctrl) { - String q = top->GetDesc(); - if(IsNull(q)) - s << " (" << typeid(*top).name() << ")"; - else - s << " (\"" << q << "\")"; - } + String q = top->GetDesc(); + if(IsNull(q)) + s << " (" << typeid(*top).name() << ")"; + else + s << " (\"" << q << "\")"; + } return s; } diff --git a/uppsrc/CtrlCore/GtkApp.cpp b/uppsrc/CtrlCore/GtkApp.cpp index 2b6dc9bbb..5471eda34 100644 --- a/uppsrc/CtrlCore/GtkApp.cpp +++ b/uppsrc/CtrlCore/GtkApp.cpp @@ -61,9 +61,9 @@ bool RunningOnWayland() return running_on_wayland; } -void sTheme(void *) +void Ctrl::ThemeChanged(void *) { - DDUMP(GetSysTime()); + PostReSkin(); } void InitGtkApp(int argc, char **argv, const char **envptr) @@ -98,8 +98,8 @@ void InitGtkApp(int argc, char **argv, const char **envptr) #endif GtkSettings *settings = gtk_settings_get_default (); if(settings) { - g_signal_connect_swapped(settings, "notify::gtk-theme-name", G_CALLBACK(sTheme), NULL); - g_signal_connect_swapped(settings, "notify::gtk-application-prefer-dark-theme", G_CALLBACK(sTheme), NULL); + g_signal_connect_swapped(settings, "notify::gtk-theme-name", G_CALLBACK(Ctrl::ThemeChanged), NULL); + g_signal_connect_swapped(settings, "notify::gtk-application-prefer-dark-theme", G_CALLBACK(Ctrl::ThemeChanged), NULL); } } diff --git a/uppsrc/CtrlCore/GtkCtrl.h b/uppsrc/CtrlCore/GtkCtrl.h index 40dce63f7..f77436787 100644 --- a/uppsrc/CtrlCore/GtkCtrl.h +++ b/uppsrc/CtrlCore/GtkCtrl.h @@ -10,6 +10,8 @@ static void AddEvent(gpointer user_data, int type, const Value& value, GdkEvent *event); static void FetchEvents(bool may_block); + static void ThemeChanged(void *); + /* _DBG_ static void AddEvent(gpointer user_data, int type, const Value& value);