Merge lp:~3v1n0/gtk/unity-rgba-tooltips into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Marco Trevisan (Treviño)]

debian/patches/unity_rbga_tooltips.patch:
  - GtkTooltip: set always an rgba visual when running in Unity (LP: #1508357)

[lp:~3v1n0/gtk/unity-rgba-tooltips]

469. By Marco Trevisan (Treviño) on 2015-10-21

debian/patches/unity_rbga_tooltips.patch: add patch-header

[Lars Karlitski (larsu)]

Yep, as discussed. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 08:18:44 +0000
+++ debian/changelog	2015-10-21 13:40:17 +0000
@@ -1,3 +1,10 @@
+gtk+3.0 (3.16.7-0ubuntu4) UNRELEASED; urgency=medium
+
+  * debian/patches/unity_rbga_tooltips.patch:
+    - GtkTooltip: set always an rgba visual when running in Unity (LP: #1508357)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 21 Oct 2015 15:30:47 +0200
+
 gtk+3.0 (3.16.7-0ubuntu3) wily; urgency=medium
 
   * debian/control: refresh from control.in

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-10-16 08:18:24 +0000
+++ debian/patches/series	2015-10-21 13:40:17 +0000
@@ -24,3 +24,4 @@
 0001-calendar-always-emit-day-selected-once.patch
 git_icon_fallback.patch
 git_nameless_devices.patch
+unity_rbga_tooltips.patch

=== added file 'debian/patches/unity_rbga_tooltips.patch'
--- debian/patches/unity_rbga_tooltips.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/unity_rbga_tooltips.patch	2015-10-21 13:40:17 +0000
@@ -0,0 +1,24 @@
+Description: Ensure that tooltips are drawn on a rgba surface in Unity
+ This has to be removed once better unity/CSD integration has landed
+Author: Marco Trevisan <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1508357
+
+Index: gtk+3.0-3.16.7/gtk/gtktooltip.c
+===================================================================
+--- gtk+3.0-3.16.7.orig/gtk/gtktooltip.c
++++ gtk+3.0-3.16.7/gtk/gtktooltip.c
+@@ -197,6 +197,14 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+   context = gtk_widget_get_style_context (window);
+   gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLTIP);
+ 
++  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
++    {
++      GdkVisual *visual;
++      visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (window));
++      if (visual)
++        gtk_widget_set_visual (GTK_WIDGET (window), visual);
++    }
++
+   atk_obj = gtk_widget_get_accessible (window);
+   if (GTK_IS_ACCESSIBLE (atk_obj))
+     atk_object_set_role (atk_obj, ATK_ROLE_TOOL_TIP);