[gtk+/gtk-style-context: 135/191] GtkThemingEngine: Cairo-ify frame rendering from GtkStyle.
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-style-context: 135/191] GtkThemingEngine: Cairo-ify frame rendering from GtkStyle.
- Date: Tue, 17 Aug 2010 13:59:32 +0000 (UTC)
commit 4dad3df452b6c4a86d361aa0ad940e000e8f6968
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Jul 19 11:59:27 2010 +0200
GtkThemingEngine: Cairo-ify frame rendering from GtkStyle.
gtk/gtkthemingengine.c | 108 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 25 deletions(-)
---
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index b974b45..7457bc3 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -867,8 +867,8 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
{
GtkStateFlags flags;
GtkStateType state;
- GdkColor *bg_color;
GdkColor lighter, darker;
+ GdkColor *bg_color;
cairo_save (cr);
flags = gtk_theming_engine_get_state (engine);
@@ -888,52 +888,110 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
color_shade (bg_color, 0.7, &darker);
color_shade (bg_color, 1.3, &lighter);
- if (flags & GTK_STATE_FLAG_ACTIVE)
+ if (gtk_theming_engine_has_class (engine, "entry") ||
+ gtk_theming_engine_has_class (engine, "scrolled-window"))
{
- add_path_rounded_rectangle (cr, 0,
- SIDE_BOTTOM | SIDE_RIGHT,
- x, y, width, height);
-
- gdk_cairo_set_source_color (cr, &lighter);
+ gdk_cairo_set_source_color (cr, bg_color);
+ add_path_rectangle_sides (cr, x + 1, y + 1, width - 2, height - 2,
+ SIDE_BOTTOM | SIDE_RIGHT);
cairo_stroke (cr);
- add_path_rounded_rectangle (cr, 0,
- SIDE_TOP | SIDE_LEFT,
- x + 1, y + 1, width - 2, height - 2);
cairo_set_source_rgb (cr, 0, 0, 0);
+ add_path_rectangle_sides (cr, x + 1, y + 1, width - 2, height - 2,
+ SIDE_TOP | SIDE_LEFT);
+ cairo_stroke (cr);
+
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_BOTTOM | SIDE_RIGHT);
cairo_stroke (cr);
- add_path_rounded_rectangle (cr, 0,
- SIDE_TOP | SIDE_LEFT,
- x, y, width, height);
gdk_cairo_set_source_color (cr, &darker);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_TOP | SIDE_LEFT);
cairo_stroke (cr);
}
- else
+ else if (gtk_theming_engine_has_class (engine, "button") &&
+ gtk_theming_engine_has_class (engine, "default"))
{
- add_path_rounded_rectangle (cr, 0,
- SIDE_BOTTOM | SIDE_RIGHT,
- x, y, width, height);
-
cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_rectangle (cr, x + 0.5, x + 0.5, width - 1, height - 1);
+ cairo_stroke (cr);
+ }
+ else if (gtk_theming_engine_has_class (engine, "scrollbar") &&
+ gtk_theming_engine_has_class (engine, "trough"))
+ {
+ gdk_cairo_set_source_color (cr, &darker);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_TOP | SIDE_LEFT);
cairo_stroke (cr);
- add_path_rounded_rectangle (cr, 0,
- SIDE_BOTTOM | SIDE_RIGHT,
- x, y, width - 1, height - 1);
+ gdk_cairo_set_source_color (cr, &lighter);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_BOTTOM | SIDE_RIGHT);
+ cairo_stroke (cr);
+ }
+ else if (gtk_theming_engine_has_class (engine, "spinbutton"))
+ {
+ gdk_cairo_set_source_color (cr, &lighter);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_BOTTOM | SIDE_RIGHT);
+ cairo_stroke (cr);
gdk_cairo_set_source_color (cr, &darker);
+ add_path_rectangle_sides (cr, x, y, width, height, SIDE_TOP);
cairo_stroke (cr);
- add_path_rounded_rectangle (cr, 0,
- SIDE_TOP | SIDE_LEFT,
- x, y, width, height);
+ gdk_cairo_set_source_color (cr, bg_color);
+ add_path_rectangle_sides (cr, x, y, width - 1, height - 1, SIDE_BOTTOM);
+ cairo_stroke (cr);
- gdk_cairo_set_source_color (cr, &lighter);
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ add_path_rectangle_sides (cr, x + 1, y + 1, width - 2, height - 2,
+ SIDE_TOP | SIDE_LEFT | SIDE_RIGHT);
cairo_stroke (cr);
}
+ else
+ {
+ if (flags & GTK_STATE_FLAG_ACTIVE)
+ {
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ add_path_rectangle_sides (cr, x + 1, y + 1, width - 2, height - 2,
+ SIDE_TOP | SIDE_LEFT);
+ cairo_stroke (cr);
+
+ gdk_cairo_set_source_color (cr, &lighter);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_BOTTOM | SIDE_RIGHT);
+ cairo_stroke (cr);
+
+ gdk_cairo_set_source_color (cr, &darker);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_TOP | SIDE_LEFT);
+ cairo_stroke (cr);
+ }
+ else
+ {
+ gdk_cairo_set_source_color (cr, &darker);
+ add_path_rectangle_sides (cr, x, y, width - 1, height - 1,
+ SIDE_BOTTOM | SIDE_RIGHT);
+ cairo_stroke (cr);
+
+ gdk_cairo_set_source_color (cr, &lighter);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_TOP | SIDE_LEFT);
+ cairo_stroke (cr);
+
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ add_path_rectangle_sides (cr, x, y, width, height,
+ SIDE_BOTTOM | SIDE_RIGHT);
+ cairo_stroke (cr);
+ }
+ }
cairo_restore (cr);
+
+ gdk_color_free (bg_color);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]