From 7eea4d477154160e3dd52b76346218b0ca22f8ed Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Fri, 8 Jan 2016 21:51:03 +0100 Subject: GTK3 editable-label: copy-paste code from GTK+ to sync drawing with GtkLabel taken from: https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=ca9f8d8 https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=e3feaf8 https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=caa55b7 --- eel/eel-editable-label.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 220 insertions(+), 3 deletions(-) diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 4998c807..3e138305 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -49,6 +49,218 @@ #define g_memmove memmove #endif +#if GTK_CHECK_VERSION (3, 0, 0) +/* copy-paste from gtk/gtkpango.c */ +#define EEL_TYPE_FILL_LAYOUT_RENDERER (_eel_fill_layout_renderer_get_type()) +#define EEL_FILL_LAYOUT_RENDERER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), EEL_TYPE_FILL_LAYOUT_RENDERER, EelFillLayoutRenderer)) +#define EEL_IS_FILL_LAYOUT_RENDERER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), EEL_TYPE_FILL_LAYOUT_RENDERER)) +#define EEL_FILL_LAYOUT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_FILL_LAYOUT_RENDERER, EelFillLayoutRendererClass)) +#define EEL_IS_FILL_LAYOUT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_FILL_LAYOUT_RENDERER)) +#define EEL_FILL_LAYOUT_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_FILL_LAYOUT_RENDERER, EelFillLayoutRendererClass)) + +typedef struct _EelFillLayoutRenderer EelFillLayoutRenderer; +typedef struct _EelFillLayoutRendererClass EelFillLayoutRendererClass; + +struct _EelFillLayoutRenderer +{ + PangoRenderer parent_instance; + + cairo_t *cr; +}; + +struct _EelFillLayoutRendererClass +{ + PangoRendererClass parent_class; +}; + +static GType _eel_fill_layout_renderer_get_type (void); +G_DEFINE_TYPE (EelFillLayoutRenderer, _eel_fill_layout_renderer, PANGO_TYPE_RENDERER) + +static void +eel_fill_layout_renderer_draw_glyphs (PangoRenderer *renderer, + PangoFont *font, + PangoGlyphString *glyphs, + int x, + int y) +{ + EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer); + + cairo_move_to (text_renderer->cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); + pango_cairo_show_glyph_string (text_renderer->cr, font, glyphs); +} + +static void +eel_fill_layout_renderer_draw_glyph_item (PangoRenderer *renderer, + const char *text, + PangoGlyphItem *glyph_item, + int x, + int y) +{ + EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer); + + cairo_move_to (text_renderer->cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); + pango_cairo_show_glyph_item (text_renderer->cr, text, glyph_item); +} + +static void +eel_fill_layout_renderer_draw_rectangle (PangoRenderer *renderer, + PangoRenderPart part, + int x, + int y, + int width, + int height) +{ + EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer); + + if (part == PANGO_RENDER_PART_BACKGROUND) + return; + + cairo_rectangle (text_renderer->cr, + (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, + (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); + cairo_fill (text_renderer->cr); +} + +static void +eel_fill_layout_renderer_draw_trapezoid (PangoRenderer *renderer, + PangoRenderPart part, + double y1_, + double x11, + double x21, + double y2, + double x12, + double x22) +{ + EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer); + cairo_matrix_t matrix; + cairo_t *cr; + + cr = text_renderer->cr; + + cairo_save (cr); + + /* use identity scale, but keep translation */ + cairo_get_matrix (cr, &matrix); + matrix.xx = matrix.yy = 1; + matrix.xy = matrix.yx = 0; + cairo_set_matrix (cr, &matrix); + + cairo_move_to (cr, x11, y1_); + cairo_line_to (cr, x21, y1_); + cairo_line_to (cr, x22, y2); + cairo_line_to (cr, x12, y2); + cairo_close_path (cr); + + cairo_fill (cr); + + cairo_restore (cr); +} + +static void +eel_fill_layout_renderer_draw_error_underline (PangoRenderer *renderer, + int x, + int y, + int width, + int height) +{ + EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer); + + pango_cairo_show_error_underline (text_renderer->cr, + (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, + (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); +} + +static void +eel_fill_layout_renderer_draw_shape (PangoRenderer *renderer, + PangoAttrShape *attr, + int x, + int y) +{ + EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer); + cairo_t *cr = text_renderer->cr; + PangoLayout *layout; + PangoCairoShapeRendererFunc shape_renderer; + gpointer shape_renderer_data; + + layout = pango_renderer_get_layout (renderer); + + if (!layout) + return; + + shape_renderer = pango_cairo_context_get_shape_renderer (pango_layout_get_context (layout), + &shape_renderer_data); + + if (!shape_renderer) + return; + + cairo_save (cr); + + cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); + + shape_renderer (cr, attr, FALSE, shape_renderer_data); + + cairo_restore (cr); +} + +static void +eel_fill_layout_renderer_finalize (GObject *object) +{ + G_OBJECT_CLASS (_eel_fill_layout_renderer_parent_class)->finalize (object); +} + +static void +_eel_fill_layout_renderer_init (EelFillLayoutRenderer *renderer) +{ +} + +static void +_eel_fill_layout_renderer_class_init (EelFillLayoutRendererClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass); + + renderer_class->draw_glyphs = eel_fill_layout_renderer_draw_glyphs; + renderer_class->draw_glyph_item = eel_fill_layout_renderer_draw_glyph_item; + renderer_class->draw_rectangle = eel_fill_layout_renderer_draw_rectangle; + renderer_class->draw_trapezoid = eel_fill_layout_renderer_draw_trapezoid; + renderer_class->draw_error_underline = eel_fill_layout_renderer_draw_error_underline; + renderer_class->draw_shape = eel_fill_layout_renderer_draw_shape; + + object_class->finalize = eel_fill_layout_renderer_finalize; +} + +static void +_eel_pango_fill_layout (cairo_t *cr, + PangoLayout *layout) +{ + static EelFillLayoutRenderer *renderer = NULL; + gboolean has_current_point; + double current_x, current_y; + + has_current_point = cairo_has_current_point (cr); + cairo_get_current_point (cr, ¤t_x, ¤t_y); + + if (renderer == NULL) + renderer = g_object_new (EEL_TYPE_FILL_LAYOUT_RENDERER, NULL); + + cairo_save (cr); + cairo_translate (cr, current_x, current_y); + + renderer->cr = cr; + pango_renderer_draw_layout (PANGO_RENDERER (renderer), layout, 0, 0); + + cairo_restore (cr); + + if (has_current_point) + cairo_move_to (cr, current_x, current_y); +} + +/* end copy-paste from gtkpango.c */ + +/* end copy-paste from gtkpango.c */ +#endif + enum { MOVE_CURSOR, @@ -1702,6 +1914,8 @@ eel_editable_label_draw (GtkWidget *widget, range, 1); + cairo_save (cr); + gdk_cairo_region (cr, clip); cairo_clip (cr); @@ -1716,7 +1930,7 @@ eel_editable_label_draw (GtkWidget *widget, cairo_save (cr); gdk_cairo_set_source_rgba (cr, &color); - gtk_render_layout (style, cr, x, y, label->layout); + _eel_pango_fill_layout (cr, label->layout); cairo_restore (cr); @@ -1733,6 +1947,11 @@ eel_editable_label_draw (GtkWidget *widget, gtk_widget_get_allocation (widget, &allocation); gtk_style_context_get_color (style, gtk_widget_get_state_flags (widget), &color); gdk_cairo_set_source_rgba (cr, &color); + cairo_set_line_width (cr, 1.0); + cairo_rectangle (cr, 0.5, 0.5, + allocation.width - 2, + allocation.height - 2); + cairo_stroke (cr); #else eel_editable_label_expose (GtkWidget *widget, GdkEventExpose *event) @@ -1823,14 +2042,12 @@ eel_editable_label_expose (GtkWidget *widget, gtk_widget_get_allocation (widget, &allocation); cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget)); gdk_cairo_set_source_color (cr, &style->text [gtk_widget_get_state (widget)]); -#endif cairo_set_line_width (cr, 1.0); cairo_rectangle (cr, 0.5, 0.5, allocation.width - 1, allocation.height - 1); cairo_stroke (cr); -#if !GTK_CHECK_VERSION(3,0,0) cairo_destroy (cr); #endif } -- cgit v1.2.1