[gimp/gtk3-port: 190/226] app: port GimpCurveView to GtkStyleContext
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 190/226] app: port GimpCurveView to GtkStyleContext
- Date: Sun, 28 Apr 2013 19:32:25 +0000 (UTC)
commit e98066ef0f38170033785b64108e1b23960d6c27
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 | 60 +++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 27 deletions(-)
---
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
index 6f73120..bed0d2b 100644
--- a/app/widgets/gimpcurveview.c
+++ b/app/widgets/gimpcurveview.c
@@ -37,6 +37,7 @@
#include "gimpclipboard.h"
#include "gimpcurveview.h"
+#include "gimpwidgets-utils.h"
enum
@@ -491,23 +492,31 @@ 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;
- gint layout_x;
- gint layout_y;
- 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;
+ gint layout_x;
+ gint layout_y;
+ 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;
@@ -516,19 +525,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);
@@ -546,7 +557,6 @@ gimp_curve_view_draw (GtkWidget *widget,
width - border - layout_x,
height - border - layout_y);
- gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
pango_cairo_show_layout (cr, view->layout);
}
@@ -565,7 +575,6 @@ gimp_curve_view_draw (GtkWidget *widget,
2 * border + layout_x);
cairo_rotate (cr, - G_PI / 2);
- gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
pango_cairo_show_layout (cr, view->layout);
cairo_restore (cr);
@@ -591,7 +600,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);
@@ -599,8 +608,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++)
{
@@ -625,8 +632,6 @@ gimp_curve_view_draw (GtkWidget *widget,
{
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),
@@ -691,7 +696,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);
@@ -724,7 +728,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);
@@ -733,6 +737,8 @@ gimp_curve_view_draw (GtkWidget *widget,
cairo_paint_with_alpha (cr, 0.6);
}
+ gtk_style_context_restore (style);
+
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]