diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-10 12:01:49 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-10 12:01:49 +0200 |
| commit | 0e2c2a79ad0ef31d639f84983b72f19a288c871f (patch) | |
| tree | 81e3f3f47962654b6da4987a5d0dea2c1ff1ca16 /plugins/gtkui | |
| parent | 49508a75eeb63ab65f6cb84c14e46e679fad2688 (diff) | |
fixed couple of regressions in gtk event handlers
Diffstat (limited to 'plugins/gtkui')
| -rw-r--r-- | plugins/gtkui/callbacks.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index d239ff03..49281181 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1087,6 +1087,9 @@ on_mainwin_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { + if (event->window != mainwin->window) { + return FALSE; + } GtkWidget *volumebar = lookup_widget (mainwin, "volumebar"); GtkWidget *seekbar = lookup_widget (mainwin, "seekbar"); if (event->x >= volumebar->allocation.x && event->x < volumebar->allocation.x + volumebar->allocation.width @@ -1110,9 +1113,10 @@ on_mainwin_button_release_event (GtkWidget *widget, gpointer user_data) { if (capture) { - return gtk_widget_event (capture, (GdkEvent *)event); + gboolean res = gtk_widget_event (capture, (GdkEvent *)event); + capture = NULL; + return res; } - capture = NULL; return FALSE; } @@ -1124,6 +1128,9 @@ on_mainwin_scroll_event (GtkWidget *widget, gpointer user_data) { GdkEventScroll *event = (GdkEventScroll *)ev; + if (event->window != mainwin->window) { + return FALSE; + } GtkWidget *volumebar = lookup_widget (mainwin, "volumebar"); GtkWidget *seekbar = lookup_widget (mainwin, "seekbar"); if (event->x >= volumebar->allocation.x && event->x < volumebar->allocation.x + volumebar->allocation.width |