r35588 - in /desktop/unstable/gtk+3.0/debian: changelog patches/073_transparent_colors.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Aug  6 16:45:40 2012
New Revision: 35588

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35588
Log:
debian/patches/073_transparent_colors.patch: Handle transparent colors
better in GtkStyle emulation. Patch cherry-picked from upstream Git.
Closes: #669694

Added:
    desktop/unstable/gtk+3.0/debian/patches/073_transparent_colors.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=35588&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Mon Aug  6 16:45:40 2012
@@ -8,6 +8,9 @@
     this removes files owned by libgtk-3-common. Those bits were copied over
     from the gtk+2.0 package but they are actually obsolete and no longer
     required. Closes: #681198
+  * debian/patches/073_transparent_colors.patch: Handle transparent colors
+    better in GtkStyle emulation. Patch cherry-picked from upstream Git.
+    Closes: #669694
 
  -- Michael Biebl <biebl at debian.org>  Mon, 06 Aug 2012 18:00:10 +0200
 

Added: desktop/unstable/gtk+3.0/debian/patches/073_transparent_colors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/073_transparent_colors.patch?rev=35588&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/073_transparent_colors.patch (added)
+++ desktop/unstable/gtk+3.0/debian/patches/073_transparent_colors.patch [utf-8] Mon Aug  6 16:45:40 2012
@@ -1,0 +1,33 @@
+From 72feb95edb6ab8c3fac27c0c32afeb2b2f61bd1c Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl at redhat.com>
+Date: Thu, 28 Jun 2012 19:30:24 +0000
+Subject: Handle transparent colors better in GtkStyle emulation
+
+We can't expose colors with alpha in the GtkStyle colors, since
+GdkColor has no alpha. Currently we throw away alpha completely,
+which fails very badly for completely transparent backgrounds,
+which now is the default for most widgets, as it typically
+end up with black-on-black.
+
+We handle this by falling back on the default/previous colors for
+transparent colors. This is is simple and avoids complete failure.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=671437
+
+(cherry picked from commit 10423726709539724be0ea19bed76ba4331af774)
+---
+diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
+index 5266368..16e3ce4 100644
+--- a/gtk/deprecated/gtkstyle.c
++++ b/gtk/deprecated/gtkstyle.c
+@@ -673,7 +673,7 @@ set_color (GtkStyle        *style,
+       break;
+     }
+ 
+-  if (color)
++  if (color && color->alpha > 0.01)
+     {
+       dest->pixel = 0;
+       dest->red = CLAMP ((guint) (color->red * 65535), 0, 65535);
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=35588&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Mon Aug  6 16:45:40 2012
@@ -11,3 +11,4 @@
 070_revert-widget-set-up-signals-after-initializing.patch
 071_fix-installation-of-HTML-images.patch
 072_statusicon_icon_size.patch
+073_transparent_colors.patch