[Xfce4-commits] <xfwm4:master> Pick up gtk-colors in composited version too

[Nick Schermer]

Updating branch refs/heads/master
         to d9fd4483b8cd0d91cc32e0095d70ece745049edc (commit)
       from d2a728a22fc61219123eabd4a25d77ad8fc614cf (commit)

commit d9fd4483b8cd0d91cc32e0095d70ece745049edc
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Jul 13 18:36:12 2013 +0200

    Pick up gtk-colors in composited version too

 src/tabwin.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/tabwin.c b/src/tabwin.c
index e1077a2..4d6431d 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -100,7 +100,8 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event, gpointer data)
 {
     GtkWindow *window;
     GdkScreen *screen;
-    GdkColor *bg_normal, *bg_insensitive;
+    GdkColor *bg_normal = get_color(tbw, GTK_STATE_NORMAL);
+    GdkColor *bg_selected = get_color(tbw, GTK_STATE_SELECTED);
     cairo_t *cr;
     gint radius = 10.0;
     double degrees = 3.14 / 180.0;
@@ -127,19 +128,17 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event, gpointer data)
         cairo_arc (cr, radius + 0.5, height - radius - 0.5, radius, 90 * degrees, 180 * degrees);
         cairo_arc (cr, radius + 0.5, radius + 0.5, radius, 180 * degrees, 270 * degrees);
         cairo_close_path(cr);
-        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
+        cairo_set_source_rgba (cr, bg_normal->red/65535.0, bg_normal->green/65535.0, bg_normal->blue/65535.0, 0.8);
         cairo_fill_preserve (cr);
-        cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
+        cairo_set_source_rgba (cr, bg_selected->red/65535.0, bg_selected->green/65535.0, bg_selected->blue/65535.0, 0.8);
         cairo_stroke (cr);
     }
     else {
         cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
         cairo_rectangle(cr, 0, 0, width, height);
-        bg_normal = get_color(tbw, GTK_STATE_NORMAL);
         gdk_cairo_set_source_color(cr, bg_normal);
         cairo_fill_preserve (cr);
-        bg_insensitive = get_color(tbw, GTK_STATE_SELECTED);
-        gdk_cairo_set_source_color(cr, bg_insensitive);
+        gdk_cairo_set_source_color(cr, bg_selected);
         cairo_stroke (cr);
     }