summaryrefslogtreecommitdiff
path: root/gtk/gtksettings.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-04-21 15:45:21 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-04-22 19:29:59 -0400
commit4b13d99cfe75b3c176be33628a4882893e1fdcaa (patch)
tree30466822fbe040d9f6d797a9599cbb638fb352b7 /gtk/gtksettings.c
parent129b8bb7f19d2ba35263622fcee6bcc1d8a46da3 (diff)
downloadgtk+-4b13d99cfe75b3c176be33628a4882893e1fdcaa.tar.gz
settings: Call gtk_system_setting_changed
Replace calls to gtk_style_context_reset_widgets by gtk_system_setting_changed, with the appropriate setting, and add style invalidation where required.
Diffstat (limited to 'gtk/gtksettings.c')
-rw-r--r--gtk/gtksettings.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index c6b9634213..fe1af8e9bf 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -29,7 +29,7 @@
#include "gtkstyleproviderprivate.h"
#include "gtktypebuiltins.h"
#include "gtkversion.h"
-#include "gtkwidget.h"
+#include "gtkwidgetprivate.h"
#include "gdk/gdk-private.h"
@@ -1246,32 +1246,28 @@ gtk_settings_notify (GObject *object,
case PROP_FONT_NAME:
settings_update_font_values (settings);
settings_invalidate_style (settings);
- gtk_style_context_reset_widgets (settings->display);
+ gtk_system_setting_changed (settings->display, GTK_SYSTEM_SETTING_FONT_NAME);
break;
case PROP_THEME_NAME:
case PROP_APPLICATION_PREFER_DARK_THEME:
settings_update_theme (settings);
break;
case PROP_XFT_DPI:
- /* This is a hack because with gtk_rc_reset_styles() doesn't get
- * widgets with gtk_widget_style_set(), and also causes more
- * recomputation than necessary.
- */
- gtk_style_context_reset_widgets (settings->display);
+ gtk_system_setting_changed (settings->display, GTK_SYSTEM_SETTING_DPI);
break;
case PROP_XFT_ANTIALIAS:
case PROP_XFT_HINTING:
case PROP_XFT_HINTSTYLE:
case PROP_XFT_RGBA:
settings_update_font_options (settings);
- gtk_style_context_reset_widgets (settings->display);
+ gtk_system_setting_changed (settings->display, GTK_SYSTEM_SETTING_FONT_CONFIG);
break;
case PROP_FONTCONFIG_TIMESTAMP:
if (settings_update_fontconfig (settings))
- gtk_style_context_reset_widgets (settings->display);
+ gtk_system_setting_changed (settings->display, GTK_SYSTEM_SETTING_FONT_CONFIG);
break;
case PROP_ENABLE_ANIMATIONS:
- gtk_style_context_reset_widgets (settings->display);
+ settings_invalidate_style (settings);
break;
case PROP_CURSOR_THEME_NAME:
case PROP_CURSOR_THEME_SIZE: