forked from AuroraMiddleware/gtk
Quick fix for size allocation -- needs more work overall
This commit is contained in:
parent
102b1de4b4
commit
36e83663cf
@ -416,13 +416,23 @@ gtk_handle_box_size_allocate (GtkWidget *widget,
|
|||||||
hb = GTK_HANDLE_BOX (widget);
|
hb = GTK_HANDLE_BOX (widget);
|
||||||
|
|
||||||
widget->allocation.x = allocation->x;
|
widget->allocation.x = allocation->x;
|
||||||
if (allocation->height > widget->requisition.height)
|
|
||||||
widget->allocation.y = allocation->y + (allocation->height - widget->requisition.height) / 2;
|
if (hb->child_detached)
|
||||||
|
{
|
||||||
|
if (allocation->height > widget->requisition.height)
|
||||||
|
widget->allocation.y = allocation->y +
|
||||||
|
(allocation->height - widget->requisition.height) / 2;
|
||||||
|
else
|
||||||
|
widget->allocation.y = allocation->y;
|
||||||
|
|
||||||
|
widget->allocation.height = MIN (allocation->height, widget->requisition.height);
|
||||||
|
widget->allocation.width = MIN (allocation->width, widget->requisition.width);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
widget->allocation.y = allocation->y;
|
{
|
||||||
widget->allocation.height = MIN (allocation->height, widget->requisition.height);
|
widget->allocation = *allocation;
|
||||||
widget->allocation.width = MIN (allocation->width, widget->requisition.width);
|
}
|
||||||
|
|
||||||
if (GTK_WIDGET_REALIZED (hb))
|
if (GTK_WIDGET_REALIZED (hb))
|
||||||
gdk_window_move_resize (widget->window,
|
gdk_window_move_resize (widget->window,
|
||||||
widget->allocation.x,
|
widget->allocation.x,
|
||||||
|
Loading…
Reference in New Issue
Block a user