[nautilus/f19] Fix transparency issues

[Matthias Clasen]

commit 58ee4cc9abb0145466c7b95130775108acc92118
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Dec 9 13:57:25 2013 -0500

    Fix transparency issues

 Make-sure-the-desktop-window-is-transparent.patch  |   39 ++++++++++++++++++++
 ...-3.8.2-EelEditableLabel-Render-background.patch |   31 ++++++++++++++++
 nautilus.spec                                      |   11 ++++++
 3 files changed, 81 insertions(+), 0 deletions(-)
---
diff --git a/Make-sure-the-desktop-window-is-transparent.patch b/Make-sure-the-desktop-window-is-transparent.patch
new file mode 100644
index 0000000..57f68d9
--- /dev/null
+++ b/Make-sure-the-desktop-window-is-transparent.patch
@@ -0,0 +1,39 @@
+From 1311081683c04293d3b8a38e4283cc2369cf2b53 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 26 Aug 2013 17:19:50 -0400
+Subject: [PATCH] Make sure the desktop window is transparent
+
+The code was just assuming that setting an rgba visual is enough
+to make a window see-through. This assumption was invalidated
+by the GTK+ csd work that happened this cycle. We can fix this
+by explicitly setting the background color of the desktop
+window.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706665
+---
+ src/nautilus-desktop-window.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
+index d99e9fb..3ea50bd 100644
+--- a/src/nautilus-desktop-window.c
++++ b/src/nautilus-desktop-window.c
+@@ -132,6 +132,7 @@ nautilus_desktop_window_new (GtkApplication *application,
+ {
+ 	NautilusDesktopWindow *window;
+ 	int width_request, height_request;
++        GdkRGBA transparent = {0, 0, 0, 0};
+ 
+ 	width_request = gdk_screen_get_width (screen);
+ 	height_request = gdk_screen_get_height (screen);
+@@ -151,6 +152,8 @@ nautilus_desktop_window_new (GtkApplication *application,
+ 	 * Note that nautilus_desktop_window_init is too early to do this.
+ 	 */
+ 	nautilus_desktop_window_update_directory (window);
++        gtk_widget_override_background_color (GTK_WIDGET (window), 0, &transparent);
++
+ 
+ 	return window;
+ }
+-- 
+1.8.3.1
\ No newline at end of file
diff --git a/nautilus-3.8.2-EelEditableLabel-Render-background.patch b/nautilus-3.8.2-EelEditableLabel-Render-background.patch
new file mode 100644
index 0000000..f65f127
--- /dev/null
+++ b/nautilus-3.8.2-EelEditableLabel-Render-background.patch
@@ -0,0 +1,31 @@
+From c3b2b0a0223aa18cae06259304842e4af5ac1529 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl at redhat.com>
+Date: Wed, 6 Nov 2013 10:23:58 +0100
+Subject: [PATCH] EelEditableLabel: Render background
+
+Without this the rename widget background is always transparent, which
+makes it very hard to read on e.g. the desktop with a background
+image.
+---
+ eel/eel-editable-label.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
+index 0da68fd..f348a90 100644
+--- a/eel/eel-editable-label.c
++++ b/eel/eel-editable-label.c
+@@ -1504,6 +1504,11 @@ eel_editable_label_draw (GtkWidget *widget,
+   label = EEL_EDITABLE_LABEL (widget);
+   style = gtk_widget_get_style_context (widget);
+ 
++  gtk_render_background (style, cr,
++                         0, 0,
++                         gtk_widget_get_allocated_width (widget),
++                         gtk_widget_get_allocated_height (widget));
++
+   eel_editable_label_ensure_layout (label, TRUE);
+   
+   if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
+-- 
+1.8.4.2
+
diff --git a/nautilus.spec b/nautilus.spec
index dfc7595..4e2980d 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -15,6 +15,10 @@ License:        GPLv2+
 Group:          User Interface/Desktops
 Source:         http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz
 
+# upstream fixes
+Patch0: nautilus-3.8.2-EelEditableLabel-Render-background.patch
+Patch1: Make-sure-the-desktop-window-is-transparent.patch
+
 URL:            http://projects.gnome.org/nautilus/
 Requires:       redhat-menus
 Requires:       gvfs
@@ -90,6 +94,9 @@ for developing nautilus extensions.
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1
+%patch1 -p1
+
 #%patch4 -p1 -b .selinux
 
 %build
@@ -166,6 +173,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %doc %{_datadir}/gtk-doc/html/libnautilus-extension/
 
 %changelog
+* Mon Dec  9 2013 Matthias Clasen <mclasen at redhat.com> - 3.8.2-2
+- Fix transparency issues with the desktop background
+- Fix transparency issues with editable labels
+
 * Sun Jun 16 2013 Matthias Clasen <mclasen at redhat.com> - 3.8.2-1
 - Update to 3.8.2