Merge lp:~binli/unity-settings-daemon/dont-scale-out-of-screen into lp:unity-settings-daemon

[Bin Li]

/* In some case, after change the window_scale to 2 will make
   window outside of screen.
   So we puts a floor on normal window size, which are
   WINDOW_WIDTH_LIMIT and WINDOW_HEIGHT_LIMIT, now is 1024x768.
   If the window_scale is bigger than scale_x or scale_y, we
   will reset the window_scale to 1.
   For example if window_scale is 2, and screen rect.width is 1920,
   we will not scale, cause WINDOW_WIDTH_LIMIT * 2 is 2048,
   the screen don't have enough space for the minimized window. */

[Lars Karlitski (larsu)]

I don't think introducing another concept ("window_scale") to an already complex decision makes sense.

Instead, I propose that we specify a minimum logical resolution that Ubuntu needs and use that here instead. Ubiquity (and other applications) need to take care not to grow beyond that.

review: Disapprove

[Didier Roche (didrocks)]

Thanks for contribution to Ubuntu and help to make it better, as lars said, hardcoding values isn't the best strategy to be future-proof. The minimum logical size path would be better to deal that globally.

Do not hesitate if you are interested in giving a hand here if needed (larsu on #ubuntu-desktop on freenode) or through other MP!

[Lars Karlitski (larsu)]

Actually I changed my mind a bit: we shouldn;t hard-code a resolution, but a dpi. I've commented on the bug.

Unmerged revisions

4092. By Bin Li on 2015-08-24

 * Put a floor for window size to fix the issue in HiDPI.(LP: #1443767)

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-18 12:11:23 +0000
+++ debian/changelog	2015-08-24 08:22:45 +0000
@@ -1,3 +1,9 @@
+unity-settings-daemon (15.04.1+15.10.20150818-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Put a floor for window size to fix the issue in HiDPI.(LP: #1443767)
+
+ -- Bin Li <[e-mail]>  Mon, 24 Aug 2015 16:10:54 +0800
+
 unity-settings-daemon (15.04.1+15.10.20150818-0ubuntu1) wily; urgency=medium
 
   [ Carlos Garnacho ]

=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2015-06-07 19:13:44 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2015-08-24 08:22:45 +0000
@@ -224,6 +224,9 @@
 
 #define HIDPI_LIMIT (DPI_FALLBACK * 2)
 
+#define WINDOW_WIDTH_LIMIT 1024
+#define WINDOW_HEIGHT_LIMIT 768
+
 typedef struct _TranslationEntry TranslationEntry;
 typedef void (* TranslationFunc) (GnomeXSettingsManager *manager,
                                   TranslationEntry      *trans,
@@ -444,6 +447,7 @@
         int width_mm, height_mm;
         int monitor_scale;
         double dpi_x, dpi_y;
+        double scale_x, scale_y;
 
         interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
         window_scale =
@@ -479,11 +483,25 @@
                 if (width_mm > 0 && height_mm > 0) {
                         dpi_x = (double)rect.width * monitor_scale / (width_mm / 25.4);
                         dpi_y = (double)rect.height * monitor_scale / (height_mm / 25.4);
+			scale_x = (double) rect.width / WINDOW_WIDTH_LIMIT;
+			scale_y = (double) rect.height / WINDOW_HEIGHT_LIMIT;
                         /* We don't completely trust these values so both
                            must be high, and never pick higher ratio than
                            2 automatically */
                         if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT)
                                 window_scale = 2;
+                        /* In some case, after change the window_scale to 2 will make
+                           window outside of screen.
+                           So we puts a floor on normal window size, which are
+                           WINDOW_WIDTH_LIMIT and WINDOW_HEIGHT_LIMIT, now is 1024x768.
+                           If the window_scale is bigger than scale_x or scale_y, we
+                           will reset the window_scale to 1.
+                           For example if window_scale is 2, and screen rect.width is 1920,
+                           we will not scale, cause WINDOW_WIDTH_LIMIT * 2 is 2048,
+                           the screen don't have enough space for the minimized window. 
+			    */
+			if (window_scale > scale_x || window_scale > scale_y)
+				window_scale = 1;
                 }
         }