diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-07-09 20:22:16 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-07-09 20:22:16 +0000 |
| commit | 4689dc3fd3973d03daa1c48a8be3c6c448fc6aa8 (patch) | |
| tree | 8fb3ff8724aa8f1f84cc8b345740730e09878af4 /gtk | |
| parent | 73dc5465eabbdd5cce53eda3ec213dda25f99943 (diff) | |
| download | gtk+-4689dc3fd3973d03daa1c48a8be3c6c448fc6aa8.tar.gz | |
Improve the handling of broken situations. (#427899, Francesco Montorsi)
2007-07-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkframe.c (gtk_frame_size_allocate): Improve the
handling of broken situations. (#427899, Francesco Montorsi)
svn path=/trunk/; revision=18422
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index e395f1fe1d..2e57baa930 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -676,7 +676,7 @@ gtk_frame_size_allocate (GtkWidget *widget, child_allocation.x = frame->child_allocation.x + LABEL_SIDE_PAD + (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_PAD; - child_allocation.width = child_requisition.width; + child_allocation.width = MIN (child_requisition.width, new_allocation.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD); child_allocation.y = frame->child_allocation.y - MAX (child_requisition.height, widget->style->ythickness); child_allocation.height = child_requisition.height; |