diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-02-04 19:22:20 -0600 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2016-03-01 10:27:05 +0000 |
| commit | 602e5e3ecb08d1b24ee20f177dd59cdba6238ebb (patch) | |
| tree | 4e5a86dc58571bca34aa6009ea58c13581109dc8 | |
| parent | 787500fcb170b4aca22ff1aa09a3f9019166b72d (diff) | |
| download | yelp-602e5e3ecb08d1b24ee20f177dd59cdba6238ebb.tar.gz | |
settings: Fix GtkStyleContext warning spam
This is happening in basically every application, due to implementation
changes in GtkStyleContext
https://bugzilla.gnome.org/show_bug.cgi?id=761577
| -rw-r--r-- | libyelp/yelp-settings.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libyelp/yelp-settings.c b/libyelp/yelp-settings.c index 4c2b1ffb..74f1aee9 100644 --- a/libyelp/yelp-settings.c +++ b/libyelp/yelp-settings.c @@ -1015,15 +1015,17 @@ gtk_theme_changed (GtkSettings *gtk_settings, gtk_container_add (GTK_CONTAINER (tmpbox), tmpview); gtk_container_add (GTK_CONTAINER (tmpbox), tmplink); gtk_widget_show_all (tmpwin); - context = gtk_widget_get_style_context (tmpview); - /* I have to do this for some reason. Don't ask me why. Ain't in the docs. */ - gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW); - linkcontext = gtk_widget_get_style_context (tmplink); + context = gtk_widget_get_style_context (tmpview); + gtk_style_context_save (context); + gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW); gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &text); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &base); + gtk_style_context_restore (context); + rgb_to_hsv (text, &text_h, &text_s, &text_v); rgb_to_hsv (base, &base_h, &base_s, &base_v); @@ -1035,16 +1037,24 @@ gtk_theme_changed (GtkSettings *gtk_settings, g_snprintf (settings->priv->colors[YELP_SETTINGS_COLOR_TEXT], 8, "#%02X%02X%02X", (guint) (text.red * 255), (guint) (text.green * 255), (guint) (text.blue * 255)); + linkcontext = gtk_widget_get_style_context (tmplink); + gtk_style_context_save (linkcontext); + /* YELP_SETTINGS_COLOR_LINK */ + gtk_style_context_set_state (linkcontext, GTK_STATE_FLAG_LINK); gtk_style_context_get_color (linkcontext, GTK_STATE_FLAG_LINK, &link); g_snprintf (settings->priv->colors[YELP_SETTINGS_COLOR_LINK], 8, "#%02X%02X%02X", (guint) (link.red * 255), (guint) (link.green * 255), (guint) (link.blue * 255)); /* YELP_SETTINGS_COLOR_LINK_VISITED */ + gtk_style_context_set_state (linkcontext, GTK_STATE_FLAG_VISITED); gtk_style_context_get_color (linkcontext, GTK_STATE_FLAG_VISITED, &link); g_snprintf (settings->priv->colors[YELP_SETTINGS_COLOR_LINK_VISITED], 8, "#%02X%02X%02X", (guint) (link.red * 255), (guint) (link.green * 255), (guint) (link.blue * 255)); + + gtk_style_context_restore (linkcontext); + /* YELP_SETTINGS_COLOR_TEXT_LIGHT */ hsv_to_hex (text_h, text_s, text_v - ((text_v - base_v) * 0.25), settings->priv->colors[YELP_SETTINGS_COLOR_TEXT_LIGHT]); |