Merge lp:~larsu/nautilus/lp1480217 into lp:~ubuntu-desktop/nautilus/ubuntu

[Lars Karlitski]

Update wallpaper patch to listen to scale factor changes

[Sebastien Bacher (seb128)]

thanks but that doesn't seem to work, the callback is never called here...

review: Needs Fixing

[lp:~larsu/nautilus/lp1480217]

473. By Lars Karlitski on 2015-10-30

Update wallpaper patch to listen to scale factor changes

Fixes LP: #1480217

[Lars Karlitski (larsu)]

Indeed, I was on the wrong track there sorry. Force-pushed a new branch.

The problem was that the underlying gdk window never changed size because it only listened to the screen's size-changed signals, but dpi changes are apparently only notified via monitors-changed.

[lp:~larsu/nautilus/lp1480217]

474. By Lars Karlitski on 2015-11-02

wallpaper patch: update desktop icons when device scale changes

[Iain Lane (laney)]

this rules! you rule!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-22 10:03:30 +0000
+++ debian/changelog	2015-11-02 11:03:52 +0000
@@ -1,3 +1,10 @@
+nautilus (1:3.14.2-0ubuntu14) UNRELEASED; urgency=medium
+
+  * debian/patches/ubuntu_revert_no_wallpaper.patch:
+    - update to listen to scale factor changes (lp: #1480217)
+
+ -- Lars Uebernickel <[e-mail]>  Fri, 30 Oct 2015 16:47:46 +0100
+
 nautilus (1:3.14.2-0ubuntu13) wily; urgency=medium
 
   * debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch:

=== modified file 'debian/patches/ubuntu_revert_no_wallpaper.patch'
--- debian/patches/ubuntu_revert_no_wallpaper.patch	2014-01-15 01:39:50 +0000
+++ debian/patches/ubuntu_revert_no_wallpaper.patch	2015-11-02 11:03:52 +0000
@@ -1,8 +1,23 @@
-Index: nautilus-3.8.2/libnautilus-private/Makefile.am
-===================================================================
---- nautilus-3.8.2.orig/libnautilus-private/Makefile.am	2014-01-15 14:32:04.681605034 +1300
-+++ nautilus-3.8.2/libnautilus-private/Makefile.am	2014-01-15 14:32:04.677605034 +1300
-@@ -78,6 +78,8 @@
+From 90625221ec1ef82fe221c3d376d92f40154cae69 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Fri, 30 Oct 2015 10:42:23 +0100
+Subject: [PATCH] Restore background drawing
+
+---
+ libnautilus-private/Makefile.am                   |   2 +
+ libnautilus-private/nautilus-desktop-background.c | 601 ++++++++++++++++++++++
+ libnautilus-private/nautilus-desktop-background.h |  68 +++
+ src/nautilus-desktop-canvas-view.c                |  39 +-
+ src/nautilus-desktop-window.c                     |  16 +-
+ 5 files changed, 706 insertions(+), 20 deletions(-)
+ create mode 100644 libnautilus-private/nautilus-desktop-background.c
+ create mode 100644 libnautilus-private/nautilus-desktop-background.h
+
+diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
+index df31a39..7d3fa83 100644
+--- a/libnautilus-private/Makefile.am
++++ b/libnautilus-private/Makefile.am
+@@ -60,6 +60,8 @@ libnautilus_private_la_SOURCES = \
  	nautilus-debug.h \
  	nautilus-default-file-icon.c \
  	nautilus-default-file-icon.h \
@@ -11,11 +26,12 @@
  	nautilus-desktop-directory-file.c \
  	nautilus-desktop-directory-file.h \
  	nautilus-desktop-directory.c \
-Index: nautilus-3.8.2/libnautilus-private/nautilus-desktop-background.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.8.2/libnautilus-private/nautilus-desktop-background.c	2014-01-15 14:32:04.677605034 +1300
-@@ -0,0 +1,599 @@
+diff --git a/libnautilus-private/nautilus-desktop-background.c b/libnautilus-private/nautilus-desktop-background.c
+new file mode 100644
+index 0000000..ec0c70d
+--- /dev/null
++++ b/libnautilus-private/nautilus-desktop-background.c
+@@ -0,0 +1,601 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +
 +/*
@@ -352,6 +368,8 @@
 +
 +	gtk_widget_queue_draw (self->details->widget);
 +
++	nautilus_canvas_container_request_update_all (NAUTILUS_CANVAS_CONTAINER (self->details->widget));
++
 +	return FALSE;
 +}
 +
@@ -615,10 +633,11 @@
 +                             "widget", container,
 +                             NULL);
 +}
-Index: nautilus-3.8.2/libnautilus-private/nautilus-desktop-background.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.8.2/libnautilus-private/nautilus-desktop-background.h	2014-01-15 14:32:04.677605034 +1300
+diff --git a/libnautilus-private/nautilus-desktop-background.h b/libnautilus-private/nautilus-desktop-background.h
+new file mode 100644
+index 0000000..aa306ba
+--- /dev/null
++++ b/libnautilus-private/nautilus-desktop-background.h
 @@ -0,0 +1,68 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +
@@ -688,11 +707,11 @@
 +};
 +
 +#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
-Index: nautilus-3.8.2/src/nautilus-desktop-canvas-view.c
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-desktop-canvas-view.c	2014-01-15 14:32:04.681605034 +1300
-+++ nautilus-3.8.2/src/nautilus-desktop-canvas-view.c	2014-01-15 14:32:04.677605034 +1300
-@@ -41,6 +41,7 @@
+diff --git a/src/nautilus-desktop-canvas-view.c b/src/nautilus-desktop-canvas-view.c
+index c6971f5..d66f013 100644
+--- a/src/nautilus-desktop-canvas-view.c
++++ b/src/nautilus-desktop-canvas-view.c
+@@ -39,6 +39,7 @@
  #include <fcntl.h>
  #include <gdk/gdkx.h>
  #include <glib/gi18n.h>
@@ -700,7 +719,7 @@
  #include <libnautilus-private/nautilus-desktop-icon-file.h>
  #include <libnautilus-private/nautilus-directory-notify.h>
  #include <libnautilus-private/nautilus-file-changes-queue.h>
-@@ -75,6 +76,8 @@
+@@ -73,6 +74,8 @@ struct NautilusDesktopCanvasViewDetails
  	gulong delayed_init_signal;
  	guint reload_desktop_timeout;
  	gboolean pending_rescan;
@@ -709,7 +728,7 @@
  };
  
  static void     default_zoom_level_changed                        (gpointer                user_data);
-@@ -231,6 +234,22 @@
+@@ -229,6 +232,22 @@ desktop_canvas_view_property_filter (GdkXEvent *gdk_xevent,
  	return GDK_FILTER_CONTINUE;
  }
  
@@ -732,7 +751,7 @@
  static const char *
  real_get_id (NautilusView *view)
  {
-@@ -268,6 +287,11 @@
+@@ -266,6 +285,11 @@ nautilus_desktop_canvas_view_dispose (GObject *object)
  					      nautilus_view_update_menus,
  					      canvas_view);
  
@@ -744,7 +763,7 @@
  	G_OBJECT_CLASS (nautilus_desktop_canvas_view_parent_class)->dispose (object);
  }
  
-@@ -280,6 +304,7 @@
+@@ -278,6 +302,7 @@ nautilus_desktop_canvas_view_class_init (NautilusDesktopCanvasViewClass *class)
  
  	G_OBJECT_CLASS (class)->dispose = nautilus_desktop_canvas_view_dispose;
  
@@ -752,7 +771,7 @@
  	vclass->merge_menus = real_merge_menus;
  	vclass->update_menus = real_update_menus;
  	vclass->get_view_id = real_get_id;
-@@ -322,17 +347,6 @@
+@@ -320,17 +345,6 @@ realized_callback (GtkWidget *widget, NautilusDesktopCanvasView *desktop_canvas_
  			       desktop_canvas_view);
  }
  
@@ -770,7 +789,7 @@
  static NautilusZoomLevel
  get_default_zoom_level (void)
  {
-@@ -498,9 +512,6 @@
+@@ -494,9 +508,6 @@ nautilus_desktop_canvas_view_init (NautilusDesktopCanvasView *desktop_canvas_vie
  	nautilus_view_set_show_foreign (NAUTILUS_VIEW (desktop_canvas_view),
  					FALSE);
  
@@ -780,11 +799,32 @@
  	g_signal_connect_object (desktop_canvas_view, "realize",
  				 G_CALLBACK (realized_callback), desktop_canvas_view, 0);
  	g_signal_connect_object (desktop_canvas_view, "unrealize",
-Index: nautilus-3.8.2/src/nautilus-desktop-window.c
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-desktop-window.c	2014-01-15 14:32:04.681605034 +1300
-+++ nautilus-3.8.2/src/nautilus-desktop-window.c	2014-01-15 14:32:04.677605034 +1300
-@@ -207,7 +207,6 @@
+diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
+index 399fb9f..ea5d4bf 100644
+--- a/src/nautilus-desktop-window.c
++++ b/src/nautilus-desktop-window.c
+@@ -40,6 +40,7 @@
+ 
+ struct NautilusDesktopWindowDetails {
+ 	gulong size_changed_id;
++	gulong monitors_changed_id;
+ 
+ 	gboolean loaded;
+ 
+@@ -311,6 +312,12 @@ unrealize (GtkWidget *widget)
+ 		details->size_changed_id = 0;
+ 	}
+ 
++	if (details->monitors_changed_id != 0) {
++		g_signal_handler_disconnect (gtk_window_get_screen (GTK_WINDOW (window)),
++					     details->monitors_changed_id);
++		details->monitors_changed_id = 0;
++	}
++
+ 	gtk_widget_destroy (details->desktop_selection);
+ 
+ 	GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->unrealize (widget);
+@@ -334,7 +341,6 @@ realize (GtkWidget *widget)
  {
  	NautilusDesktopWindow *window;
  	NautilusDesktopWindowDetails *details;
@@ -792,7 +832,7 @@
  
  	window = NAUTILUS_DESKTOP_WINDOW (widget);
  	details = window->details;
-@@ -216,11 +215,6 @@
+@@ -343,11 +349,6 @@ realize (GtkWidget *widget)
  	gtk_widget_set_events (widget, gtk_widget_get_events (widget) 
  			      | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
  			      
@@ -804,3 +844,16 @@
  	/* Do the work of realizing. */
  	GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->realize (widget);
  
+@@ -357,6 +358,9 @@ realize (GtkWidget *widget)
+ 	details->size_changed_id =
+ 		g_signal_connect (gtk_window_get_screen (GTK_WINDOW (window)), "size-changed",
+ 				  G_CALLBACK (nautilus_desktop_window_screen_size_changed), window);
++	details->monitors_changed_id =
++		g_signal_connect (gtk_window_get_screen (GTK_WINDOW (window)), "monitors-changed",
++				  G_CALLBACK (nautilus_desktop_window_screen_size_changed), window);
+ }
+ 
+ static void
+-- 
+2.5.0
+