[gimp/gtk3-port: 209/236] app: port GimpCurveView to GtkStyleContext

[Michael Natterer <mitch src gnome org>]

commit eecd124223fc65ef5e44e8e759897406f73774be
Author: Michael Natterer <mitch gimp org>
Date:   Mon Feb 7 22:20:55 2011 +0100

    app: port GimpCurveView to GtkStyleContext
    
    reusing the new grid-color property added in the parent class.

 app/widgets/gimpcurveview.c |   54 ++++++++++++++++++++++++------------------
 1 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
index bb9d89f..63bc5b4 100644
--- a/app/widgets/gimpcurveview.c
+++ b/app/widgets/gimpcurveview.c
@@ -36,6 +36,7 @@
 
 #include "gimpclipboard.h"
 #include "gimpcurveview.h"
+#include "gimpwidgets-utils.h"
 
 
 enum
@@ -451,21 +452,29 @@ static gboolean
 gimp_curve_view_draw (GtkWidget *widget,
                       cairo_t   *cr)
 {
-  GimpCurveView *view  = GIMP_CURVE_VIEW (widget);
-  GtkStyle      *style = gtk_widget_get_style (widget);
-  GtkAllocation  allocation;
-  GList         *list;
-  gint           border;
-  gint           width;
-  gint           height;
-  gdouble        x, y;
-  gint           i;
-
+  GimpCurveView   *view  = GIMP_CURVE_VIEW (widget);
+  GtkStyleContext *style = gtk_widget_get_style_context (widget);
+  GtkAllocation    allocation;
+  GdkRGBA          grid_color;
+  GdkRGBA          fg_color;
+  GdkRGBA          bg_color;
+  GList           *list;
+  gint             border;
+  gint             width;
+  gint             height;
+  gdouble          x, y;
+  gint             i;
+
+  cairo_save (cr);
   GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
+  cairo_restore (cr);
 
   if (! view->curve)
     return FALSE;
 
+  gtk_style_context_save (style);
+  gtk_style_context_add_class (style, GTK_STYLE_CLASS_ENTRY);
+
   gtk_widget_get_allocation (widget, &allocation);
 
   border = GIMP_HISTOGRAM_VIEW (view)->border_width;
@@ -474,19 +483,21 @@ gimp_curve_view_draw (GtkWidget *widget,
 
   if (gtk_widget_has_focus (widget))
     {
-      gtk_paint_focus (style, cr,
-                       gtk_widget_get_state (widget),
-                       widget, NULL,
-                       border - 2, border - 2,
-                       width + 4, height + 4);
+      gtk_render_focus (style, cr,
+                        border - 2, border - 2,
+                        width + 4, height + 4);
     }
 
   cairo_set_line_width (cr, 1.0);
   cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
   cairo_translate (cr, 0.5, 0.5);
 
+  gtk_style_context_get_color (style, 0, &fg_color);
+  gtk_style_context_get_background_color (style, 0, &bg_color);
+  gimp_get_style_color (widget, "grid-color", &grid_color);
+
   /*  Draw the grid lines  */
-  gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
+  gdk_cairo_set_source_rgba (cr, &grid_color);
 
   gimp_curve_view_draw_grid (view, cr, width, height, border);
 
@@ -509,7 +520,7 @@ gimp_curve_view_draw (GtkWidget *widget,
   if (view->curve_color)
     gimp_cairo_set_source_rgb (cr, view->curve_color);
   else
-    gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
+    gdk_cairo_set_source_rgba (cr, &fg_color);
 
   gimp_curve_view_draw_curve (view, cr, view->curve,
                               width, height, border);
@@ -517,8 +528,6 @@ gimp_curve_view_draw (GtkWidget *widget,
   /*  Draw the points  */
   if (gimp_curve_get_curve_type (view->curve) == GIMP_CURVE_SMOOTH)
     {
-      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
-
       /*  Draw the unselected points  */
       for (i = 0; i < view->curve->n_points; i++)
         {
@@ -545,8 +554,6 @@ gimp_curve_view_draw (GtkWidget *widget,
       gint  layout_y;
       gchar buf[32];
 
-      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
-
       /* draw the color line */
       cairo_move_to (cr,
                      border + ROUND ((gdouble) (width - 1) * view->xpos),
@@ -609,7 +616,6 @@ gimp_curve_view_draw (GtkWidget *widget,
 
       cairo_push_group (cr);
 
-      gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
       cairo_rectangle (cr, x + 0.5, y + 0.5, w, h);
       cairo_fill_preserve (cr);
 
@@ -642,7 +648,7 @@ gimp_curve_view_draw (GtkWidget *widget,
 
       pango_layout_set_text (view->cursor_layout, buf, -1);
 
-      gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
+      gdk_cairo_set_source_rgba (cr, &bg_color);
 
       cairo_move_to (cr, x, y);
       pango_cairo_show_layout (cr, view->cursor_layout);
@@ -652,6 +658,8 @@ gimp_curve_view_draw (GtkWidget *widget,
       cairo_paint_with_alpha (cr, 0.6);
     }
 
+  gtk_style_context_restore (style);
+
   return FALSE;
 }