isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-21 07:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Make unscaled-font-dpi override font-dpi

Browse Source 
The :unscaled-font-dpi property is used to override the existing
:font-dpi value when running on high DPI density displays; since it's a
write-only property we don't need to have a separate storage, nor we
need to choose between :font-dpi and :unscaled-font-dpi depending on
whether or not either has been set. If we select which one to use
between :font-dpi and :unscaled-font-dpi when computing the font
resolution, we end up breaking the code that relies on changing
:font-dpi directly on a per-Settings basis.
This commit is contained in:
Emmanuele Bassi 2014-01-23 11:30:49 +00:00
parent 696a536b26
commit 773e544c51
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clutter/clutter-settings.c
View File

@ -207,9 +207,7 @@ settings_update_resolution (ClutterSettings *self)
{ {
const char *scale_env = NULL; const char *scale_env = NULL;
if (self->unscaled_font_dpi > 0) if (self->font_dpi > 0)
self->resolution = (gdouble) self->unscaled_font_dpi / 1024.0;
else if (self->font_dpi > 0)
self->resolution = (gdouble) self->font_dpi / 1024.0; self->resolution = (gdouble) self->font_dpi / 1024.0;
else else
self->resolution = 96.0; self->resolution = 96.0;
@ -361,7 +359,7 @@ clutter_settings_set_property (GObject *gobject,
break; break;
case PROP_UNSCALED_FONT_DPI: case PROP_UNSCALED_FONT_DPI:
self->unscaled_font_dpi = g_value_get_int (value); self->font_dpi = g_value_get_int (value);
settings_update_resolution (self); settings_update_resolution (self);
break; break;
@ -572,15 +570,6 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
-1, -1,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
/**
* ClutterSettings:unscaled-font-dpi:
*
* The DPI used when rendering unscaled text, as a value of 1024 * dots/inch.
*
* If set to -1, the system's default will be used instead
*
* Since: 1.4
*/
obj_props[PROP_UNSCALED_FONT_DPI] = obj_props[PROP_UNSCALED_FONT_DPI] =
g_param_spec_int ("unscaled-font-dpi", g_param_spec_int ("unscaled-font-dpi",
P_("Font DPI"), P_("Font DPI"),