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

sizerequest: Fix request mode for layout managers

Browse Source 
We can't just call GtkWidgetClass::get_request_mode() anymore. If the
widget has a layout manager, we need to ask that one.
This commit is contained in:
Timm Bäder 2019-05-25 09:03:37 +02:00
parent 4134b67827
commit e22073dc97
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtksizerequest.c
View File

@ -71,6 +71,17 @@ pop_recursion_check (GtkWidget *widget,
#define pop_recursion_check(widget, orientation) #define pop_recursion_check(widget, orientation)
#endif /* G_ENABLE_CONSISTENCY_CHECKS */ #endif /* G_ENABLE_CONSISTENCY_CHECKS */
static GtkSizeRequestMode
fetch_request_mode (GtkWidget *widget)
{
GtkLayoutManager *layout_manager = gtk_widget_get_layout_manager (widget);
if (layout_manager != NULL)
return gtk_layout_manager_get_request_mode (layout_manager);
else
return GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget);
}
static gint static gint
get_number (GtkCssStyle *style, get_number (GtkCssStyle *style,
guint property) guint property)
@ -146,7 +157,7 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
cache = _gtk_widget_peek_request_cache (widget); cache = _gtk_widget_peek_request_cache (widget);
if (G_UNLIKELY (!cache->request_mode_valid)) if (G_UNLIKELY (!cache->request_mode_valid))
{ {
cache->request_mode = GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget); cache->request_mode = fetch_request_mode (widget);
cache->request_mode_valid = TRUE; cache->request_mode_valid = TRUE;
} }
@ -562,13 +573,7 @@ gtk_widget_get_request_mode (GtkWidget *widget)
if (G_UNLIKELY (!cache->request_mode_valid)) if (G_UNLIKELY (!cache->request_mode_valid))
{ {
GtkLayoutManager *layout_manager = gtk_widget_get_layout_manager (widget); cache->request_mode = fetch_request_mode (widget);
if (layout_manager != NULL)
cache->request_mode = gtk_layout_manager_get_request_mode (layout_manager);
else
cache->request_mode = GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget);
cache->request_mode_valid = TRUE; cache->request_mode_valid = TRUE;
} }