From: Jonas Ådahl <jadahl@gmail.com>
Date: Wed, 11 Oct 2017 09:55:50 +0000 (+0800)
Subject: settings: Get UI scaling factor from primary logical monitor
X-Git-Tag: archive/raspbian/3.28.1-1+rpi1~2^2^2^2^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d6d9cb159ebdfe9fde82be6660454f4a31ab245;p=mutter.git

settings: Get UI scaling factor from primary logical monitor

Don't use MAX(logical monitor scales) to determine the UI scaling
factor, just use the primary logical monitor. That's where the shell UI
will most likely be.

https://bugzilla.gnome.org/show_bug.cgi?id=788820

Gbp-Pq: Name 0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
---

diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c
index cf66334..73741fd 100644
--- a/src/backends/meta-settings.c
+++ b/src/backends/meta-settings.c
@@ -67,23 +67,14 @@ calculate_ui_scaling_factor (MetaSettings *settings)
 {
   MetaMonitorManager *monitor_manager =
     meta_backend_get_monitor_manager (settings->backend);
-  GList *logical_monitors;
-  GList *l;
-  float max_scale = 1.0;
+  MetaLogicalMonitor *primary_logical_monitor;
 
-  logical_monitors =
-    meta_monitor_manager_get_logical_monitors (monitor_manager);
-  for (l = logical_monitors; l; l = l->next)
-    {
-      MetaLogicalMonitor *logical_monitor = l->data;
-
-      max_scale = MAX (meta_logical_monitor_get_scale (logical_monitor),
-                       max_scale);
-    }
-
-  g_warn_if_fail (fmodf (max_scale, 1.0) == 0.0);
+  primary_logical_monitor =
+    meta_monitor_manager_get_primary_logical_monitor (monitor_manager);
+  if (!primary_logical_monitor)
+    return 1;
 
-  return (int) max_scale;
+  return (int) meta_logical_monitor_get_scale (primary_logical_monitor);
 }
 
 static gboolean