AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

style: Convert draw_layout vfunc to Cairo version

Browse Source
This commit is contained in:
Benjamin Otte 2010-08-16 15:21:01 +02:00
parent ff6e75adbc
commit d80e2897b9
2 changed files with 69 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gtk/gtkstyle.c
View File

@ -275,10 +275,9 @@ static void gtk_default_draw_expander (GtkStyle *style,
gint y, gint y,
GtkExpanderStyle expander_style); GtkExpanderStyle expander_style);
static void gtk_default_draw_layout (GtkStyle *style, static void gtk_default_draw_layout (GtkStyle *style,
GdkWindow *window, cairo_t *cr,
GtkStateType state_type, GtkStateType state_type,
gboolean use_text, gboolean use_text,
GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -3923,28 +3922,18 @@ gtk_default_draw_expander (GtkStyle *style,
static void static void
gtk_default_draw_layout (GtkStyle *style, gtk_default_draw_layout (GtkStyle *style,
GdkWindow *window, cairo_t *cr,
GtkStateType state_type, GtkStateType state_type,
gboolean use_text, gboolean use_text,
GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
gint y, gint y,
PangoLayout *layout) PangoLayout *layout)
{ {
cairo_t *cr;
GdkColor *gc; GdkColor *gc;
const PangoMatrix *matrix; const PangoMatrix *matrix;
cr = gdk_cairo_create (window);
if (area)
{
gdk_cairo_rectangle (cr, area);
cairo_clip (cr);
}
matrix = pango_context_get_matrix (pango_layout_get_context (layout)); matrix = pango_context_get_matrix (pango_layout_get_context (layout));
if (matrix) if (matrix)
{ {
@ -3985,8 +3974,6 @@ gtk_default_draw_layout (GtkStyle *style,
gdk_cairo_set_source_color (cr, gc); gdk_cairo_set_source_color (cr, gc);
pango_cairo_show_layout (cr, layout); pango_cairo_show_layout (cr, layout);
cairo_destroy (cr);
} }
static void static void
@ -6151,13 +6138,58 @@ gtk_paint_layout (GtkStyle *style,
gint y, gint y,
PangoLayout *layout) PangoLayout *layout)
{ {
cairo_t *cr;
g_return_if_fail (GTK_IS_STYLE (style)); g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL); g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
g_return_if_fail (style->depth == gdk_drawable_get_depth (window)); g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, cr = gtk_style_cairo_create (window, area);
(GdkRectangle *) area, widget, detail,
gtk_cairo_paint_layout (style, cr, state_type, use_text,
widget, detail,
x, y, layout); x, y, layout);
cairo_destroy (cr);
}
/**
* gtk_cairo_paint_layout:
* @style: a #GtkStyle
* @cr: a #cairo_t
* @state_type: a state
* @use_text: whether to use the text or foreground
* graphics context of @style
* @widget: (allow-none): the widget
* @detail: (allow-none): a style detail
* @x: x origin
* @y: y origin
* @layout: the layout to draw
*
* Draws a layout on @cr using the given parameters.
**/
void
gtk_cairo_paint_layout (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
gboolean use_text,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
PangoLayout *layout)
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
g_return_if_fail (cr != NULL);
cairo_save (cr);
GTK_STYLE_GET_CLASS (style)->draw_layout (style, cr, state_type, use_text,
widget, detail,
x, y, layout);
cairo_restore (cr);
} }
/** /**

12
gtk/gtkstyle.h
View File

@ -341,10 +341,9 @@ struct _GtkStyleClass
gint y, gint y,
GtkExpanderStyle expander_style); GtkExpanderStyle expander_style);
void (*draw_layout) (GtkStyle *style, void (*draw_layout) (GtkStyle *style,
GdkWindow *window, cairo_t *cr,
GtkStateType state_type, GtkStateType state_type,
gboolean use_text, gboolean use_text,
GdkRectangle *area,
GtkWidget *widget, GtkWidget *widget,
const gchar *detail, const gchar *detail,
gint x, gint x,
@ -812,6 +811,15 @@ void gtk_paint_layout (GtkStyle *style,
gint x, gint x,
gint y, gint y,
PangoLayout *layout); PangoLayout *layout);
void gtk_cairo_paint_layout (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
gboolean use_text,
GtkWidget *widget,
const gchar *detail,
gint x,
gint y,
PangoLayout *layout);
void gtk_paint_resize_grip (GtkStyle *style, void gtk_paint_resize_grip (GtkStyle *style,
GdkWindow *window, GdkWindow *window,
GtkStateType state_type, GtkStateType state_type,