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

toolbar: Remove dead code

Browse Source 
The size definitely changes, otherwise ->size_allocate does not get
called.
This commit is contained in:
Timm Bäder 2018-11-13 05:09:35 +01:00
parent 0d47a6c970
commit e656f66720
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtktoolbar.c
View File

@ -1201,7 +1201,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
{ {
GtkToolbar *toolbar = GTK_TOOLBAR (widget); GtkToolbar *toolbar = GTK_TOOLBAR (widget);
GtkToolbarPrivate *priv = toolbar->priv; GtkToolbarPrivate *priv = toolbar->priv;
GtkAllocation arrow_allocation, item_area, widget_allocation; GtkAllocation arrow_allocation, item_area;
GtkAllocation *allocations; GtkAllocation *allocations;
ItemState *new_states; ItemState *new_states;
gint arrow_size; gint arrow_size;
@ -1215,20 +1215,8 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
gint needed_size; gint needed_size;
GtkRequisition arrow_requisition; GtkRequisition arrow_requisition;
gboolean overflowing; gboolean overflowing;
gboolean size_changed;
gtk_widget_get_allocation (widget, &widget_allocation); gtk_toolbar_stop_sliding (toolbar);
size_changed = FALSE;
if (widget_allocation.x != priv->prev_allocation.x ||
widget_allocation.y != priv->prev_allocation.y ||
widget_allocation.width != priv->prev_allocation.width ||
widget_allocation.height != priv->prev_allocation.height)
{
size_changed = TRUE;
}
if (size_changed)
gtk_toolbar_stop_sliding (toolbar);
gtk_widget_get_preferred_size (priv->arrow_button, gtk_widget_get_preferred_size (priv->arrow_button,
&arrow_requisition, NULL); &arrow_requisition, NULL);
@ -1430,8 +1418,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
new_states[i] != NORMAL) new_states[i] != NORMAL)
{ {
/* an item disappeared and we didn't change size, so begin sliding */ /* an item disappeared and we didn't change size, so begin sliding */
if (!size_changed) gtk_toolbar_begin_sliding (toolbar);
gtk_toolbar_begin_sliding (toolbar);
} }
} }