1
0
Fork 0

DisplayConfig: Add 'legacy-ui-scaling-factor' property

We have this value in mutter; lets share it so that for example
gnome-settings-daemon doesn't have to calculate it itself.

https://bugzilla.gnome.org/show_bug.cgi?id=788820
This commit is contained in:
Jonas Ådahl 2017-10-11 17:59:04 +08:00
parent eaf9ccde39
commit fad5657eda
2 changed files with 11 additions and 0 deletions

View file

@ -1261,12 +1261,14 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
GDBusMethodInvocation *invocation) GDBusMethodInvocation *invocation)
{ {
MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton); MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
MetaSettings *settings = meta_backend_get_settings (manager->backend);
GVariantBuilder monitors_builder; GVariantBuilder monitors_builder;
GVariantBuilder logical_monitors_builder; GVariantBuilder logical_monitors_builder;
GVariantBuilder properties_builder; GVariantBuilder properties_builder;
GList *l; GList *l;
int i; int i;
MetaMonitorManagerCapability capabilities; MetaMonitorManagerCapability capabilities;
int ui_scaling_factor;
int max_screen_width, max_screen_height; int max_screen_width, max_screen_height;
g_variant_builder_init (&monitors_builder, g_variant_builder_init (&monitors_builder,
@ -1444,6 +1446,11 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
g_variant_new_boolean (TRUE)); g_variant_new_boolean (TRUE));
} }
ui_scaling_factor = meta_settings_get_ui_scaling_factor (settings);
g_variant_builder_add (&properties_builder, "{sv}",
"legacy-ui-scaling-factor",
g_variant_new_int32 (ui_scaling_factor));
if (meta_monitor_manager_get_max_screen_size (manager, if (meta_monitor_manager_get_max_screen_size (manager,
&max_screen_width, &max_screen_width,
&max_screen_height)) &max_screen_height))

View file

@ -394,6 +394,10 @@
always use the same scale. Absence of always use the same scale. Absence of
this means logical monitor scales can this means logical monitor scales can
differ. differ.
* "legacy-ui-scaling-factor" (i): The legacy scaling factor traditionally
used to scale X11 clients (commonly
communicated via the
Gdk/WindowScalingFactor XSetting entry).
--> -->
<method name="GetCurrentState"> <method name="GetCurrentState">
<arg name="serial" direction="out" type="u" /> <arg name="serial" direction="out" type="u" />