Popdown the list before changing the active iter, otherwise people will be

2006-03-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released)
	(gtk_combo_box_list_key_press): Popdown the list before changing
	the active iter, otherwise people will be surprised by the
	grabs that are still in place when their ::changed handler
	runs.

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 44575179b31ebd2e0e1c49e4152be8d359398a42..196f493462f4504a7bb29e95e2b38b9c1d7cb876 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3577,11 +3577,11 @@ gtk_combo_box_list_button_released (GtkWidget      *widget,
   gtk_tree_model_get_iter (combo_box->priv->model, &iter, path);
   gtk_tree_path_free (path);
 
+  gtk_combo_box_popdown (combo_box);
+
   if (tree_column_row_is_sensitive (combo_box, &iter))
     gtk_combo_box_set_active_iter (combo_box, &iter);
 
-  gtk_combo_box_popdown (combo_box);
-
   return TRUE;
 }
 
@@ -3685,12 +3685,12 @@ gtk_combo_box_list_key_press (GtkWidget   *widget,
       ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) && 
        state == GDK_MOD1_MASK))
     {
+      gtk_combo_box_popdown (combo_box);
+      
       /* reset active item -- this is incredibly lame and ugly */
       if (gtk_combo_box_get_active_iter (combo_box, &iter))
        gtk_combo_box_set_active_iter (combo_box, &iter);
       
-      gtk_combo_box_popdown (combo_box);
-      
       return TRUE;
     }
     
@@ -3702,13 +3702,15 @@ gtk_combo_box_list_key_press (GtkWidget   *widget,
     
     if (combo_box->priv->model)
       {
-       GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
+       GtkTreeSelection *sel;
+
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
+
+       gtk_combo_box_popdown (combo_box);
     
        if (gtk_tree_selection_get_selected (sel, &model, &iter))
          gtk_combo_box_set_active_iter (combo_box, &iter);
       }
-
-    gtk_combo_box_popdown (combo_box);
     
     return TRUE;
   }