[gtk+] tests: Hardcode testinput colors instead of trying to use GtkStyle



commit 198fc0b774cbe51d4336246e8d34e8ab3d24cb1f
Author: Benjamin Otte <otte redhat com>
Date:   Wed Dec 15 14:29:37 2010 +0100

    tests: Hardcode testinput colors instead of trying to use GtkStyle
    
    Makes it work with new themeing APIs.

 tests/testinput.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/tests/testinput.c b/tests/testinput.c
index b125c75..c7348d7 100644
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -119,26 +119,27 @@ static void
 draw_brush (GtkWidget *widget, GdkInputSource source,
 	    gdouble x, gdouble y, gdouble pressure)
 {
-  GtkStyle *style;
-  GdkColor color;
+  GdkRGBA color;
   GdkRectangle update_rect;
   cairo_t *cr;
 
-  style = gtk_widget_get_style (widget);
+  color.alpha = 1.0;
 
   switch (source)
     {
     case GDK_SOURCE_MOUSE:
-      color = style->dark[gtk_widget_get_state (widget)];
+      color.red = color.green = 0.0;
+      color.blue = 1.0;
       break;
     case GDK_SOURCE_PEN:
-      color.red = color.green = color.blue = 0;
+      color.red = color.green = color.blue = 0.0;
       break;
     case GDK_SOURCE_ERASER:
-      color.red = color.green = color.blue = 65535;
+      color.red = color.green = color.blue = 1.0;
       break;
     default:
-      color = style->light[gtk_widget_get_state (widget)];
+      color.red = color.blue = 0.0;
+      color.green = 1.0;
     }
 
   update_rect.x = x - 10 * pressure;
@@ -147,7 +148,7 @@ draw_brush (GtkWidget *widget, GdkInputSource source,
   update_rect.height = 20 * pressure;
 
   cr = cairo_create (surface);
-  gdk_cairo_set_source_color (cr, &color);
+  gdk_cairo_set_source_rgba (cr, &color);
   gdk_cairo_rectangle (cr, &update_rect);
   cairo_fill (cr);
   cairo_destroy (cr);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]