callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

listbox: return GDK_EVENT_STOP if button events were handled

Browse Source 
The button press/release handlers did invariably return FALSE, even
though it shouldn't if a row was found on the event coordinates. Also,
use GDK_EVENT_* defines for the return values.
This commit is contained in:
Carlos Garnacho
2014-01-28 16:44:01 +01:00
parent 709fb26587
commit 628b1f5e1c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtklistbox.c
View File

@ -1252,6 +1252,7 @@ gtk_list_box_button_press_event (GtkWidget *widget,
{ {
GtkListBox *list_box = GTK_LIST_BOX (widget); GtkListBox *list_box = GTK_LIST_BOX (widget);
GtkListBoxPrivate *priv = gtk_list_box_get_instance_private (list_box); GtkListBoxPrivate *priv = gtk_list_box_get_instance_private (list_box);
gboolean retval = GDK_EVENT_PROPAGATE;
gboolean ctrl_pressed; gboolean ctrl_pressed;
GdkWindow *window; GdkWindow *window;
double x, y; double x, y;
@ -1301,13 +1302,14 @@ gtk_list_box_button_press_event (GtkWidget *widget,
gtk_widget_queue_draw (GTK_WIDGET (list_box)); gtk_widget_queue_draw (GTK_WIDGET (list_box));
} }
retval = GDK_EVENT_STOP;
} }
/* TODO: /* TODO:
Should mark as active while down, Should mark as active while down,
and handle grab breaks */ and handle grab breaks */
} }
return FALSE; return retval;
} }
static gboolean static gboolean
@ -1316,6 +1318,7 @@ gtk_list_box_button_release_event (GtkWidget *widget,
{ {
GtkListBox *list_box = GTK_LIST_BOX (widget); GtkListBox *list_box = GTK_LIST_BOX (widget);
GtkListBoxPrivate *priv = gtk_list_box_get_instance_private (list_box); GtkListBoxPrivate *priv = gtk_list_box_get_instance_private (list_box);
gboolean retval = GDK_EVENT_PROPAGATE;
/* Take a ref to protect against reentrancy (i.e. the activation may destroy the widget) */ /* Take a ref to protect against reentrancy (i.e. the activation may destroy the widget) */
g_object_ref (list_box); g_object_ref (list_box);
@ -1333,6 +1336,7 @@ gtk_list_box_button_release_event (GtkWidget *widget,
else else
gtk_list_box_update_selected (list_box, priv->active_row); gtk_list_box_update_selected (list_box, priv->active_row);
retval = GDK_EVENT_STOP;
} }
priv->active_row = NULL; priv->active_row = NULL;
priv->active_row_active = FALSE; priv->active_row_active = FALSE;
@ -1341,7 +1345,7 @@ gtk_list_box_button_release_event (GtkWidget *widget,
g_object_unref (list_box); g_object_unref (list_box);
return FALSE; return retval;
} }
static void static void