Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infinite sizing loop caused by 3b4ee5a0

Browse Source 
Avoid the problems 3b4ee5a0 attempted to address in a much simpler way:
when a "size-allocate" is in progress, call gtk_widget_size_allocate()
directly, rather than deferring a call to gtk_widget_queue_resize().
See #17585
This commit is contained in:
Paul Cornett
2016-12-09 21:38:35 -08:00
parent 7122288416
commit d5681ee4a8
3 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gtk/win_gtk.cpp
View File

@@ -105,24 +105,8 @@ static void pizza_size_allocate(GtkWidget* widget, GtkAllocation* alloc)
const wxPizzaChild* child = static_cast<wxPizzaChild*>(p->data);
if (gtk_widget_get_visible(child->widget))
{
GtkAllocation child_alloc;
// note that child positions do not take border into
// account, they need to be relative to widget->window,
// which has already been adjusted
child_alloc.x = child->x - pizza->m_scroll_x;
child_alloc.y = child->y - pizza->m_scroll_y;
child_alloc.width = child->width;
child_alloc.height = child->height;
if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
child_alloc.x = w - child_alloc.x - child_alloc.width;
// GTK+3 doesn't like allocating 0 size, so don't do it.
#ifdef __WXGTK3__
if (child_alloc.width && child_alloc.height)
#endif
{
gtk_widget_size_allocate(child->widget, &child_alloc);
}
pizza->size_allocate_child(
child->widget, child->x, child->y, child->width, child->height, w);
}
}
}
@@ -409,6 +393,34 @@ void wxPizza::move(GtkWidget* widget, int x, int y, int width, int height)
}
}
void wxPizza::size_allocate_child(
GtkWidget* child, int x, int y, int width, int height, int parent_width)
{
if (width <= 0 || height <= 0)
return;
GtkAllocation child_alloc;
// note that child positions do not take border into account, they need to
// be relative to widget->window, which has already been adjusted
child_alloc.x = x - m_scroll_x;
child_alloc.y = y - m_scroll_y;
child_alloc.width = width;
child_alloc.height = height;
if (gtk_widget_get_direction(GTK_WIDGET(this)) == GTK_TEXT_DIR_RTL)
{
if (parent_width < 0)
{
GtkBorder border;
get_border(border);
GtkAllocation alloc;
gtk_widget_get_allocation(GTK_WIDGET(this), &alloc);
parent_width = alloc.width - border.left - border.right;
}
child_alloc.x = parent_width - child_alloc.x - child_alloc.width;
}
gtk_widget_size_allocate(child, &child_alloc);
}
void wxPizza::put(GtkWidget* widget, int x, int y, int width, int height)
{
// Re-parenting a TLW under a child window is possible at wx level but