AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 04:10:13 +00:00
Code Issues Projects Releases Wiki Activity

Remove calls to gtk_widget_set_allocation

Browse Source 
gtk_widget_size_allocate_with_baselines does it automatically now.
This commit is contained in:
Timm Bäder 2017-05-05 19:18:53 +02:00 committed by Matthias Clasen
parent cd6a8bff8f
commit 60e053f52a
13 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/gtk-demo/gtkfishbowl.c
View File

@ -113,8 +113,6 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
GtkRequisition child_requisition;
GList *children;
gtk_widget_set_allocation (widget, allocation);
for (children = priv->children; children; children = children->next)
{
child = children->data;
@ -130,6 +128,8 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
gtk_widget_size_allocate (child->widget, &child_allocation);
}
gtk_widget_set_clip (widget, allocation);
}
static double

1
gtk/gtkcalendar.c
View File

@ -2060,7 +2060,6 @@ gtk_calendar_size_allocate (GtkWidget *widget,
gint calendar_xsep = calendar_get_xsep (calendar);
get_component_paddings (calendar, &padding, NULL, NULL, NULL);
gtk_widget_set_allocation (widget, allocation);
if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
{

2
gtk/gtkeventbox.c
View File

@ -466,8 +466,6 @@ gtk_event_box_size_allocate (GtkWidget *widget,
bin = GTK_BIN (widget);
gtk_widget_set_allocation (widget, allocation);
if (!gtk_widget_get_has_window (widget))
{
child_allocation.x = allocation->x;

2
gtk/gtkfixed.c
View File

@ -419,8 +419,6 @@ gtk_fixed_size_allocate (GtkWidget *widget,
GtkRequisition child_requisition;
GList *children;
gtk_widget_set_allocation (widget, allocation);
if (gtk_widget_get_has_window (widget))
{
if (gtk_widget_get_realized (widget))

2
gtk/gtkinvisible.c
View File

@ -255,7 +255,7 @@ static void
gtk_invisible_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
gtk_widget_set_allocation (widget, allocation);
gtk_widget_set_clip (widget, allocation);
}

2
gtk/gtklayout.c
View File

@ -857,8 +857,6 @@ gtk_layout_size_allocate (GtkWidget *widget,
GtkLayoutPrivate *priv = layout->priv;
GList *tmp_list;
gtk_widget_set_allocation (widget, allocation);
tmp_list = priv->children;
while (tmp_list)

2
gtk/gtkmenu.c
View File

@ -2806,8 +2806,6 @@ gtk_menu_size_allocate (GtkWidget *widget,
menu_shell = GTK_MENU_SHELL (widget);
priv = menu->priv;
gtk_widget_set_allocation (widget, allocation);
get_menu_padding (widget, &padding);
g_free (priv->heights);

2
gtk/gtkpathbar.c
View File

@ -464,8 +464,6 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
gint down_slider_offset = 0;
GtkRequisition child_requisition;
gtk_widget_set_allocation (widget, allocation);
/* No path is set; we don't have to allocate anything. */
if (path_bar->priv->button_list == NULL)
{

1
gtk/gtkpopover.c
View File

@ -1354,7 +1354,6 @@ gtk_popover_size_allocate (GtkWidget *widget,
GtkAllocation child_clip;
GtkAllocation clip = *allocation;
gtk_widget_set_allocation (widget, allocation);
child = gtk_bin_get_child (GTK_BIN (widget));
if (child)
{

2
gtk/gtktextview.c
View File

@ -4207,8 +4207,6 @@ gtk_text_view_size_allocate (GtkWidget *widget,
widget_allocation.width != allocation->width ||
widget_allocation.height != allocation->height;
gtk_widget_set_allocation (widget, allocation);
/* distribute width/height among child windows. Ensure all
* windows get at least a 1x1 allocation.
*/

2
gtk/gtktoolitem.c
View File

@ -312,8 +312,6 @@ gtk_tool_item_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation;
GtkWidget *child;
gtk_widget_set_allocation (widget, allocation);
child = gtk_bin_get_child (GTK_BIN (widget));
if (child && gtk_widget_get_visible (child))
{

2
gtk/gtktreeview.c
View File

@ -2610,8 +2610,6 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
if (allocation->width != old_width)
width_changed = TRUE;
gtk_widget_set_allocation (widget, allocation);
/* We size-allocate the columns first because the width of the
* tree view (used in updating the adjustments below) might change.
*/

2
gtk/gtkwindow.c
View File

@ -7112,8 +7112,6 @@ _gtk_window_set_allocation (GtkWindow *window,
g_assert (allocation != NULL);
g_assert (allocation_out != NULL);
gtk_widget_set_allocation (widget, allocation);
child_allocation.x = 0;
child_allocation.y = 0;
child_allocation.width = allocation->width;