Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkOverlay: Respect overlay child min size

Browse Source 
Never allocate an overlayed child less than its minimum request.
If the minimum doesn't fit we will gracefully clip via the
widget window.

https://bugzilla.gnome.org/show_bug.cgi?id=696623
This commit is contained in:
Alexander Larsson
2013-03-28 13:24:04 +01:00
parent 785a916267
commit 7df7e092b9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkoverlay.c
View File

@@ -372,15 +372,15 @@ gtk_overlay_get_child_position (GtkOverlay *overlay,
GtkAllocation *alloc)
{
GtkAllocation main_alloc;
GtkRequisition req;
GtkRequisition min, req;
GtkAlign halign;
GtkTextDirection direction;
gtk_overlay_get_main_widget_allocation (overlay, &main_alloc);
gtk_widget_get_preferred_size (widget, NULL, &req);
gtk_widget_get_preferred_size (widget, &min, &req);
alloc->x = main_alloc.x;
alloc->width = MIN (main_alloc.width, req.width);
alloc->width = MAX (min.width, MIN (main_alloc.width, req.width));
direction = gtk_widget_get_direction (widget);
@@ -391,7 +391,7 @@ gtk_overlay_get_child_position (GtkOverlay *overlay,
/* nothing to do */
break;
case GTK_ALIGN_FILL:
alloc->width = main_alloc.width;
alloc->width = MAX (alloc->width, main_alloc.width);
break;
case GTK_ALIGN_CENTER:
alloc->x += main_alloc.width / 2 - req.width / 2;
@@ -402,7 +402,7 @@ gtk_overlay_get_child_position (GtkOverlay *overlay,
}
alloc->y = main_alloc.y;
alloc->height = MIN (main_alloc.height, req.height);
alloc->height = MAX (min.height, MIN (main_alloc.height, req.height));
switch (gtk_widget_get_valign (widget))
{
@@ -410,7 +410,7 @@ gtk_overlay_get_child_position (GtkOverlay *overlay,
/* nothing to do */
break;
case GTK_ALIGN_FILL:
alloc->height = main_alloc.height;
alloc->height = MAX (alloc->height, main_alloc.height);
break;
case GTK_ALIGN_CENTER:
alloc->y += main_alloc.height / 2 - req.height / 2;