[gtk+/wip/matthiasc/gadget] label: Allocate the gadget
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/gadget] label: Allocate the gadget
- Date: Thu, 3 Dec 2015 23:15:13 +0000 (UTC)
commit 1d1916926c4473021b78a9c1561ee43eeb07578e
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Dec 3 18:14:40 2015 -0500
label: Allocate the gadget
gtk/gtklabel.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 10b65a5..52f013a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4077,7 +4077,7 @@ gtk_label_size_allocate (GtkWidget *widget,
{
GtkLabel *label = GTK_LABEL (widget);
GtkLabelPrivate *priv = label->priv;
- GdkRectangle clip_rect;
+ GdkRectangle clip_rect, clip;
GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate (widget, allocation);
@@ -4085,15 +4085,19 @@ gtk_label_size_allocate (GtkWidget *widget,
gtk_label_update_layout_width (label);
if (priv->select_info && priv->select_info->window)
- {
- gdk_window_move_resize (priv->select_info->window,
- allocation->x,
- allocation->y,
- allocation->width,
- allocation->height);
- }
+ gdk_window_move_resize (priv->select_info->window,
+ allocation->x,
+ allocation->y,
+ allocation->width,
+ allocation->height);
+
+ gtk_css_gadget_allocate (priv->gadget,
+ allocation,
+ gtk_widget_get_allocated_baseline (widget),
+ &clip);
gtk_label_get_ink_rect (label, &clip_rect);
+ gdk_rectangle_union (&clip_rect, &clip, &clip_rect);
_gtk_widget_set_simple_clip (widget, &clip_rect);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]