Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkButton: Don't suppress unhandled mouse events

Browse Source 
Mouse events that we do not handle should bubble up to the parent
widget, so they can be handled there, instead of disappearing inside
the button. Also use GDK_EVENT_{STOP,PROPAGATE} to make return
values clearer.

https://bugzilla.gnome.org/show_bug.cgi?id=696640
This commit is contained in:
Bastien Nocera
2013-03-26 14:22:10 +01:00
parent 828f9eb1e7
commit 2b91f5de30
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkbutton.c
View File

@@ -1784,10 +1784,13 @@ gtk_button_button_press (GtkWidget *widget,
gtk_widget_grab_focus (widget);
if (event->button == GDK_BUTTON_PRIMARY)
g_signal_emit (button, button_signals[PRESSED], 0);
{
g_signal_emit (button, button_signals[PRESSED], 0);
return GDK_EVENT_STOP;
}
}
return TRUE;
return GDK_EVENT_PROPAGATE;
}
static gboolean
@@ -1800,9 +1803,10 @@ gtk_button_button_release (GtkWidget *widget,
{
button = GTK_BUTTON (widget);
g_signal_emit (button, button_signals[RELEASED], 0);
return GDK_EVENT_STOP;
}
return TRUE;
return GDK_EVENT_PROPAGATE;
}
static gboolean
@@ -1818,13 +1822,15 @@ gtk_button_touch (GtkWidget *widget,
gtk_widget_grab_focus (widget);
g_signal_emit (button, button_signals[PRESSED], 0);
return GDK_EVENT_STOP;
}
else if (event->type == GDK_TOUCH_END)
{
g_signal_emit (button, button_signals[RELEASED], 0);
return GDK_EVENT_STOP;
}
return TRUE;
return GDK_EVENT_PROPAGATE;
}
static gboolean