diff options
author | Matthias Clasen <mclasen@redhat.com> | 2017-10-31 18:53:29 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2017-10-31 18:53:29 -0400 |
commit | 31b7555b7b717d61725255c57878c311c84a0569 (patch) | |
tree | c47ad1c81d8074d3ae30db39f77e907653131718 /gtk | |
parent | a27bfaa0a30c60794138cac013d046730f44edc7 (diff) | |
download | gtk+-31b7555b7b717d61725255c57878c311c84a0569.tar.gz |
Stop using screen resolution
This api is going away.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkcssinitialvalue.c | 9 | ||||
-rw-r--r-- | gtk/gtksettings.c | 29 |
2 files changed, 5 insertions, 33 deletions
diff --git a/gtk/gtkcssinitialvalue.c b/gtk/gtkcssinitialvalue.c index c40f26d3bd..af9430abcb 100644 --- a/gtk/gtkcssinitialvalue.c +++ b/gtk/gtkcssinitialvalue.c @@ -52,11 +52,12 @@ gtk_css_value_initial_compute (GtkCssValue *value, settings = gtk_style_provider_get_settings (provider); if (settings) { - GdkScreen *screen = gdk_display_get_default_screen (_gtk_settings_get_display (settings)); - double resolution = gdk_screen_get_resolution (screen); + int dpi_int; - if (resolution > 0.0) - return _gtk_css_number_value_new (resolution, GTK_CSS_NUMBER); + g_object_get (settings, "gtk-xft-dpi", &dpi_int, NULL); + + if (dpi_int > 0.0) + return _gtk_css_number_value_new (dpi_int / 1024., GTK_CSS_NUMBER); } break; diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index a583d84709..ce7de59ff0 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -214,7 +214,6 @@ static void settings_update_double_click (GtkSettings *setting static void settings_update_modules (GtkSettings *settings); static void settings_update_cursor_theme (GtkSettings *settings); -static void settings_update_resolution (GtkSettings *settings); static void settings_update_font_options (GtkSettings *settings); static void settings_update_font_values (GtkSettings *settings); static gboolean settings_update_fontconfig (GtkSettings *settings); @@ -1230,7 +1229,6 @@ gtk_settings_create_for_display (GdkDisplay *display) settings_update_modules (settings); settings_update_double_click (settings); settings_update_cursor_theme (settings); - settings_update_resolution (settings); settings_update_font_options (settings); settings_update_font_values (settings); @@ -1379,7 +1377,6 @@ gtk_settings_notify (GObject *object, settings_update_theme (settings); break; case PROP_XFT_DPI: - settings_update_resolution (settings); /* 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. @@ -2253,32 +2250,6 @@ settings_update_fontconfig (GtkSettings *settings) } static void -settings_update_resolution (GtkSettings *settings) -{ - GtkSettingsPrivate *priv = settings->priv; - gint dpi_int; - gdouble dpi; - - /* We handle this here in the case that the dpi was set on the GtkSettings - * object by the application. Other cases are handled in - * xsettings-client.c:read-settings(). See comment there for the rationale. - */ - if (priv->property_values[PROP_XFT_DPI - 1].source == GTK_SETTINGS_SOURCE_APPLICATION) - { - g_object_get (settings, - "gtk-xft-dpi", &dpi_int, - NULL); - - if (dpi_int > 0) - dpi = dpi_int / 1024.; - else - dpi = -1.; - - gdk_screen_set_resolution (gdk_display_get_default_screen (priv->display), dpi); - } -} - -static void settings_update_provider (GdkDisplay *display, GtkCssProvider **old, GtkCssProvider *new) |