diff options
| author | Timm Bäder <mail@baedert.org> | 2017-04-28 11:26:25 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-04-28 11:27:09 +0200 |
| commit | bbe53855419737915cfbd90bf91d785f7f1f48a8 (patch) | |
| tree | 796d5787ea33ce7de5b4463b7234685ee5ecbb49 /gtk/gtkframe.c | |
| parent | 70aeeab3558b7d929cf7f9c53a9d6ba60e3364a2 (diff) | |
| download | gtk+-bbe53855419737915cfbd90bf91d785f7f1f48a8.tar.gz | |
frame: Properly initialize clip
GtkCssGadget initializes the content clip to {0, 0, 0, 0}, so we can't
just union the child clip with it.
Diffstat (limited to 'gtk/gtkframe.c')
| -rw-r--r-- | gtk/gtkframe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index fc4381c9f0..05b603d5d1 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -688,7 +688,7 @@ static void gtk_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - GtkAllocation clip = *allocation; + GtkAllocation clip; gtk_widget_set_allocation (widget, allocation); @@ -721,6 +721,8 @@ gtk_frame_allocate (GtkCssGadget *gadget, gtk_frame_compute_child_allocation (frame, &new_allocation); priv->child_allocation = new_allocation; + *out_clip = *allocation; + if (priv->label_widget && gtk_widget_get_visible (priv->label_widget)) { |