diff options
| author | Timm Bäder <mail@baedert.org> | 2017-05-03 10:19:17 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-07-19 21:27:10 -0400 |
| commit | 06950bcf8ac26ffb963493827cfad53cd0919888 (patch) | |
| tree | 03a2d087001fb1448454c578b60a3b427bd6f651 /gtk/gtklabel.c | |
| parent | 5a575c359433ce1a2323a01ef901261beb1b36ca (diff) | |
| download | gtk+-06950bcf8ac26ffb963493827cfad53cd0919888.tar.gz | |
label: Remove css box drawing
Diffstat (limited to 'gtk/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 2e0dd59dd6..8f14789516 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -553,13 +553,6 @@ static void gtk_label_measure (GtkCssGadget *gadget, int *minimum_baseline, int *natural_baseline, gpointer unused); -static gboolean gtk_label_render (GtkCssGadget *gadget, - GtkSnapshot *snapshot, - int x, - int y, - int width, - int height, - gpointer data); static GtkBuildableIface *buildable_parent_iface = NULL; @@ -1339,7 +1332,7 @@ gtk_label_init (GtkLabel *label) GTK_WIDGET (label), gtk_label_measure, NULL, - gtk_label_render, + NULL, NULL, NULL); } @@ -3954,35 +3947,24 @@ gtk_label_get_focus_link (GtkLabel *label) return NULL; } -static void -gtk_label_snapshot (GtkWidget *widget, - GtkSnapshot *snapshot) -{ - gtk_css_gadget_snapshot (GTK_LABEL (widget)->priv->gadget, snapshot); -} - static void layout_to_window_coords (GtkLabel *label, gint *x, gint *y); #define GRAPHENE_RECT_FROM_RECT(_r) (GRAPHENE_RECT_INIT ((_r)->x, (_r)->y, (_r)->width, (_r)->height)) -static gboolean -gtk_label_render (GtkCssGadget *gadget, - GtkSnapshot *snapshot, - int x, - int y, - int width, - int height, - gpointer data) + +static void +gtk_label_snapshot (GtkWidget *widget, + GtkSnapshot *snapshot) { - GtkWidget *widget; GtkLabel *label; GtkLabelPrivate *priv; GtkLabelSelectionInfo *info; GtkStyleContext *context; gint lx, ly; + GtkAllocation allocation; + int width, height, x; - widget = gtk_css_gadget_get_owner (gadget); label = GTK_LABEL (widget); priv = label->priv; info = priv->select_info; @@ -3991,6 +3973,11 @@ gtk_label_render (GtkCssGadget *gadget, context = _gtk_widget_get_style_context (widget); + gtk_widget_get_allocation (widget, &allocation); + x = 0; + width = allocation.width; + height = allocation.height; + if (GTK_IS_ACCEL_LABEL (widget)) { guint ac_width = gtk_accel_label_get_accel_width (GTK_ACCEL_LABEL (widget)); @@ -4033,7 +4020,7 @@ gtk_label_render (GtkCssGadget *gadget, gdk_cairo_region (cr, range_clip); cairo_clip (cr); - gtk_render_background (context, cr, x, y, width, height); + gtk_render_background (context, cr, x, 0, width, height); gtk_render_layout (context, cr, lx, ly, priv->layout); gtk_style_context_restore (context); @@ -4082,7 +4069,7 @@ gtk_label_render (GtkCssGadget *gadget, cairo_clip (cr); cairo_region_destroy (range_clip); - gtk_render_background (context, cr, x, y, width, height); + gtk_render_background (context, cr, x, 0, width, height); gtk_render_layout (context, cr, lx, ly, priv->layout); gtk_style_context_restore (context); @@ -4103,8 +4090,6 @@ gtk_label_render (GtkCssGadget *gadget, } } } - - return FALSE; } static gboolean |