diff options
author | Benjamin Otte <otte@redhat.com> | 2015-02-04 18:20:33 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2015-02-04 18:36:10 +0100 |
commit | 72814193419bca29d9883dbe93de0ec788c66541 (patch) | |
tree | 114e22308f93a66c37479753de18033a111badac /gtk/gtkcssstaticstyle.c | |
parent | 3e81653bd320b9d5c760c2731a225f546f353c7a (diff) | |
download | gtk+-72814193419bca29d9883dbe93de0ec788c66541.tar.gz |
css: Having a static style per screen isn't useful
Just have one static style for everything.
Diffstat (limited to 'gtk/gtkcssstaticstyle.c')
-rw-r--r-- | gtk/gtkcssstaticstyle.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/gtkcssstaticstyle.c b/gtk/gtkcssstaticstyle.c index 446935a102..a127b69968 100644 --- a/gtk/gtkcssstaticstyle.c +++ b/gtk/gtkcssstaticstyle.c @@ -182,26 +182,23 @@ gtk_css_static_style_set_value (GtkCssStaticStyle *style, } GtkCssStyle * -gtk_css_static_style_get_default (GdkScreen *screen) +gtk_css_static_style_get_default (void) { static GQuark style_quark = 0; GtkSettings *settings; GtkCssStyle *result; - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - if (style_quark == 0) style_quark = g_quark_from_string ("gtk-default-style"); - settings = gtk_settings_get_for_screen (screen); + settings = gtk_settings_get_for_screen (gdk_screen_get_default ()); result = g_object_get_qdata (G_OBJECT (settings), style_quark); if (result) return result; result = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER_PRIVATE (settings), NULL, - gdk_screen_get_monitor_scale_factor (screen, - gdk_screen_get_primary_monitor (screen)), + 1, NULL); g_object_set_qdata_full (G_OBJECT (settings), style_quark, result, g_object_unref); |