AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Improve the handling of broken situations. (#427899, Francesco Montorsi)

Browse Source 
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
This commit is contained in:
Matthias Clasen 2007-07-09 20:22:16 +00:00 committed by Matthias Clasen
parent 73dc5465ea
commit 4689dc3fd3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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

2
gtk/gtkframe.c
View File

@ -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;