Commit 4689dc3f authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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
parent 73dc5465
2007-07-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkframe.c (gtk_frame_size_allocate): Improve the
handling of broken situations. (#427899, Francesco Montorsi)
2007-07-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkviewport.c (gtk_viewport_size_request): Changed size
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment