diff options
| author | Victor Kareh <[email protected]> | 2018-02-01 15:19:49 -0500 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-02-06 17:46:45 +0100 |
| commit | 856149cbdfafabeb41598b6c818074fca6c0ee1c (patch) | |
| tree | 9daa6c47bd71fc7acbbf114d98d2795853491cb9 | |
| parent | c1b1abe5e92aa4a764e5a78276c4bc28c760b262 (diff) | |
| download | mate-control-center-856149cbdfafabeb41598b6c818074fca6c0ee1c.tar.bz2 mate-control-center-856149cbdfafabeb41598b6c818074fca6c0ee1c.tar.xz | |
Scale font DPI for HiDPI displays
Automatically scales up the font DPI when loading the GtkSpinner and
down-scale when saving it. The result is that the user gets the correct
DPI showing in the Appearance > Fonts > Details app, while gsettings
stores the down-scaled DPI.
| -rw-r--r-- | capplets/appearance/appearance-font.c | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/capplets/appearance/appearance-font.c b/capplets/appearance/appearance-font.c index cd1a4e54..998bfa28 100644 --- a/capplets/appearance/appearance-font.c +++ b/capplets/appearance/appearance-font.c @@ -422,7 +422,6 @@ get_dpi_from_x_server (void) { GdkScreen *screen; double dpi; - gint scale; screen = gdk_screen_get_default (); @@ -444,10 +443,6 @@ get_dpi_from_x_server (void) dpi = DPI_FALLBACK; } - scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen)); - if (scale) - dpi = dpi * scale; - return dpi; } @@ -458,16 +453,19 @@ static void dpi_load (GSettings *settings, GtkSpinButton *spinner) { - gdouble value = g_settings_get_double (settings, FONT_DPI_KEY); + GdkScreen *screen; + gint scale; gdouble dpi; - if (value != 0) - dpi = value; - else + screen = gdk_screen_get_default (); + scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen)); + dpi = g_settings_get_double (settings, FONT_DPI_KEY); + + if (dpi == 0) dpi = get_dpi_from_x_server (); - if (dpi < DPI_LOW_REASONABLE_VALUE) - dpi = DPI_LOW_REASONABLE_VALUE; + dpi *= (double)scale; + dpi = CLAMP(dpi, DPI_LOW_REASONABLE_VALUE, DPI_HIGH_REASONABLE_VALUE); in_change = TRUE; gtk_spin_button_set_value (spinner, dpi); @@ -483,6 +481,15 @@ dpi_changed (GSettings *settings, } static void +monitors_changed (GdkScreen *screen, + AppearanceData *data) +{ + GtkWidget *widget; + widget = appearance_capplet_get_widget (data, "dpi_spinner"); + dpi_load (data->font_settings, GTK_SPIN_BUTTON (widget)); +} + +static void dpi_value_changed (GtkSpinButton *spinner, GSettings *settings) { @@ -495,7 +502,13 @@ dpi_value_changed (GtkSpinButton *spinner, * received from GSettings, this may cause mildly strange effects. */ if (!in_change) { - gdouble new_dpi = gtk_spin_button_get_value (spinner); + GdkScreen *screen; + gint scale; + gdouble new_dpi; + + screen = gdk_screen_get_default (); + scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen)); + new_dpi = gtk_spin_button_get_value (spinner) / (double)scale; g_settings_set_double (settings, FONT_DPI_KEY, new_dpi); @@ -541,6 +554,9 @@ cb_show_details (GtkWidget *button, g_signal_connect (data->font_settings, "changed::" FONT_DPI_KEY, G_CALLBACK (dpi_changed), widget); + /* Update font DPI when window scaling factor is changed */ + g_signal_connect (gdk_screen_get_default (), "monitors-changed", G_CALLBACK (monitors_changed), data); + setup_font_sample (appearance_capplet_get_widget (data, "antialias_none_sample"), ANTIALIAS_NONE, HINT_SLIGHT); setup_font_sample (appearance_capplet_get_widget (data, "antialias_grayscale_sample"), ANTIALIAS_GRAYSCALE, HINT_SLIGHT); setup_font_sample (appearance_capplet_get_widget (data, "antialias_subpixel_sample"), ANTIALIAS_RGBA, HINT_SLIGHT); |