Keep the popup posted if the button is released over the cellview. This

2005-05-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
	the popup posted if the button is released over the cellview.
	This matches the behaviour of other combo box implementations.
	(#171378)
This commit is contained in:
Matthias Clasen
2005-05-17 05:43:20 +00:00
committed by Matthias Clasen
parent ef25506011
commit f4fc3fee86
4 changed files with 25 additions and 2 deletions

View File

@@ -1,3 +1,10 @@
2005-05-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
the popup posted if the button is released over the cellview.
This matches the behaviour of other combo box implementations.
(#171378)
2005-05-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up

View File

@@ -1,3 +1,10 @@
2005-05-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
the popup posted if the button is released over the cellview.
This matches the behaviour of other combo box implementations.
(#171378)
2005-05-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up

View File

@@ -1,3 +1,10 @@
2005-05-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
the popup posted if the button is released over the cellview.
This matches the behaviour of other combo box implementations.
(#171378)
2005-05-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkscale.c (gtk_scale_class_init): Don't bind GDK_Page_Up

View File

@@ -3416,7 +3416,8 @@ gtk_combo_box_list_button_released (GtkWidget *widget,
if (ewidget != combo_box->priv->tree_view)
{
if (ewidget == combo_box->priv->button &&
if ((ewidget == combo_box->priv->button ||
ewidget == combo_box->priv->box ) &&
!popup_in_progress &&
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button)))
{
@@ -3425,7 +3426,8 @@ gtk_combo_box_list_button_released (GtkWidget *widget,
}
/* released outside treeview */
if (ewidget != combo_box->priv->button)
if (ewidget != combo_box->priv->button &&
ewidget != combo_box->priv->box)
{
gtk_combo_box_popdown (combo_box);