From 4689dc3fd3973d03daa1c48a8be3c6c448fc6aa8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Jul 2007 20:22:16 +0000 Subject: [PATCH] Improve the handling of broken situations. (#427899, Francesco Montorsi) 2007-07-09 Matthias Clasen * gtk/gtkframe.c (gtk_frame_size_allocate): Improve the handling of broken situations. (#427899, Francesco Montorsi) svn path=/trunk/; revision=18422 --- ChangeLog | 5 +++++ gtk/gtkframe.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 44e898efdb..e875da4556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-09 Matthias Clasen + + * gtk/gtkframe.c (gtk_frame_size_allocate): Improve the + handling of broken situations. (#427899, Francesco Montorsi) + 2007-07-09 Matthias Clasen * gtk/gtkviewport.c (gtk_viewport_size_request): Changed size 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;