Merge lp:~azzar1/nautilus/higidpi-desktop-view-margins into lp:~ubuntu-desktop/nautilus/ubuntu

[Andrea Azzarone]

* debian/patches/hidpi_desktop_view_margins.patch:
  - scale desktop workarea margins.

Unmerged revisions

513. By Andrea Azzarone on 2016-07-29

* debian/patches/hidpi_desktop_view_margins.patch:
  - scale desktop workarea margins.

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-21 13:45:02 +0000
+++ debian/changelog	2016-08-01 08:31:23 +0000
@@ -1,3 +1,10 @@
+nautilus (1:3.18.4.is.3.14.3-0ubuntu6) UNRELEASED; urgency=medium
+
+  * debian/patches/hidpi_desktop_view_margins.patch:
+    - scale desktop workarea margins.
+
+ -- Andrea Azzarone <[e-mail]>  Fri, 29 Jul 2016 21:55:44 +0200
+
 nautilus (1:3.18.4.is.3.14.3-0ubuntu5) UNRELEASED; urgency=medium
 
   [ Iain Lane ]

=== added file 'debian/patches/hidpi_desktop_view_margins.patch'
--- debian/patches/hidpi_desktop_view_margins.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/hidpi_desktop_view_margins.patch	2016-08-01 08:31:23 +0000
@@ -0,0 +1,43 @@
+Description: desktop-canvas-view: scale desktop workarea
+
+The problem is that in the function canvas_container_set_workarea the screen
+width and height are in "application pixels" while the workarea ones are in
+"device pixels" so when the scaling is > 1, the margins are not properly set.
+We need to scale-down the workarea geometries to "application pixels".
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1564375
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=769302
+Forwarded: yes
+Author: Andrea Azzarone <[e-mail]>
+
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-desktop-canvas-view.c
+===================================================================
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-desktop-canvas-view.c
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-desktop-canvas-view.c
+@@ -101,6 +101,7 @@ canvas_container_set_workarea (NautilusC
+ {
+ 	int left, right, top, bottom;
+ 	int screen_width, screen_height;
++	int scale;
+ 	int i;
+ 
+ 	left = right = top = bottom = 0;
+@@ -108,11 +109,14 @@ canvas_container_set_workarea (NautilusC
+ 	screen_width  = gdk_screen_get_width (screen);
+ 	screen_height = gdk_screen_get_height (screen);
+ 
++	scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
++	scale = scale ? scale : 1;
++
+ 	for (i = 0; i < n_items; i += 4) {
+-		int x      = workareas [i];
+-		int y      = workareas [i + 1];
+-		int width  = workareas [i + 2];
+-		int height = workareas [i + 3];
++		int x      = workareas [i] / scale;
++		int y      = workareas [i + 1] / scale;
++		int width  = workareas [i + 2] / scale;
++		int height = workareas [i + 3] / scale;
+ 
+ 		if ((x + width) > screen_width || (y + height) > screen_height)
+ 			continue;

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-07-21 13:45:02 +0000
+++ debian/patches/series	2016-08-01 08:31:23 +0000
@@ -41,3 +41,4 @@
 0001-desktop-window-restore-transparency.patch
 0002-desktop-window-restore-transparency-again.patch
 git_hover_hidebar.patch
+hidpi_desktop_view_margins.patch