AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 00:11:29 +00:00
Code Issues Projects Releases Wiki Activity

toolbar: Avoid a get_own_allocation call

Browse Source 
We want the content allocation here since we are allocation child
widgets.
This commit is contained in:
Timm Bäder 2018-04-07 09:26:31 +02:00
parent 44390c16b2
commit 3593fd2a29
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktoolbar.c
View File

@ -1005,7 +1005,10 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
g_source_set_name_by_id (priv->idle_id, "[gtk+] slide_idle_handler"); g_source_set_name_by_id (priv->idle_id, "[gtk+] slide_idle_handler");
} }
gtk_widget_get_own_allocation (widget, &content_allocation); content_allocation.x = 0;
content_allocation.y = 0;
content_allocation.width = gtk_widget_get_width (widget);
content_allocation.height = gtk_widget_get_height (widget);
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
vertical = (priv->orientation == GTK_ORIENTATION_VERTICAL); vertical = (priv->orientation == GTK_ORIENTATION_VERTICAL);
@ -1021,9 +1024,6 @@ gtk_toolbar_begin_sliding (GtkToolbar *toolbar)
cur_y = 0; cur_y = 0;
} }
cur_x += content_allocation.x;
cur_y += content_allocation.y;
for (list = priv->content; list != NULL; list = list->next) for (list = priv->content; list != NULL; list = list->next)
{ {
ToolbarContent *content = list->data; ToolbarContent *content = list->data;