[gtk+/gtk-style-context: 128/251] GtkThemingEngine: Make render_background use drawing primitives.
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-style-context: 128/251] GtkThemingEngine: Make render_background use drawing primitives.
- Date: Tue, 12 Oct 2010 02:05:53 +0000 (UTC)
commit 5a39384e65f0cfee8aeb05180e5cb76fe36aebbc
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Jul 19 11:56:01 2010 +0200
GtkThemingEngine: Make render_background use drawing primitives.
gtk/gtkthemingengine.c | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index d1bca7e..5745261 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -818,7 +818,7 @@ gtk_theming_engine_render_background (GtkThemingEngine *engine,
{
GtkStateFlags flags;
GtkStateType state;
- GdkColor *bg_color;
+ GdkColor *color;
cairo_save (cr);
flags = gtk_theming_engine_get_state (engine);
@@ -830,19 +830,31 @@ gtk_theming_engine_render_background (GtkThemingEngine *engine,
else
state = GTK_STATE_NORMAL;
- gtk_theming_engine_get (engine, state,
- "background-color", &bg_color,
- NULL);
+ if (gtk_theming_engine_has_class (engine, "entry"))
+ gtk_theming_engine_get (engine, state,
+ "base-color", &color,
+ NULL);
+ else
+ gtk_theming_engine_get (engine, state,
+ "background-color", &color,
+ NULL);
- add_path_rounded_rectangle (cr, 0,
- SIDE_BOTTOM | SIDE_RIGHT | SIDE_TOP | SIDE_LEFT,
- x, y, width, height);
- cairo_close_path (cr);
+ gdk_cairo_set_source_color (cr, color);
+ cairo_rectangle (cr, x, y, width, height);
- gdk_cairo_set_source_color (cr, bg_color);
- cairo_fill (cr);
+ if (gtk_theming_engine_has_class (engine, "tooltip"))
+ {
+ cairo_fill_preserve (cr);
+
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_stroke (cr);
+ }
+ else
+ cairo_fill (cr);
cairo_restore (cr);
+
+ gdk_color_free (color);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]