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

combobox: Avoid a pointless assignment

Browse Source 
Don’t get the active item pointer before the grid/non-grid conditional,
because if we’re in grid mode, we re-get it before selecting it anyway.
This commit is contained in:
Daniel Boles 2017-01-19 03:26:09 +00:00
parent c83ead5eea
commit 94ae322f65
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkcombobox.c
View File

@ -1734,8 +1734,6 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
g_object_set (priv->popup_widget, "menu-type-hint", GDK_WINDOW_TYPE_HINT_COMBO, NULL);
active = gtk_menu_get_active (GTK_MENU (priv->popup_widget));
if (priv->wrap_width > 0 || priv->cell_view == NULL)
{
gtk_css_gadget_get_border_allocation (priv->gadget, &border_allocation, NULL);
@ -1761,6 +1759,8 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
GList *i;
GtkWidget *child;
active = gtk_menu_get_active (GTK_MENU (priv->popup_widget));
if (!(active && gtk_widget_get_visible (active)))
{
for (i = GTK_MENU_SHELL (priv->popup_widget)->priv->children; i && !active; i = i->next)