[gimp/soc-2010-cage] Bug 622608 - GIMP crashes when clicking any scroll bar from combo boxes
- From: Michael Muré <mmure src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2010-cage] Bug 622608 - GIMP crashes when clicking any scroll bar from combo boxes
- Date: Wed, 30 Jun 2010 22:16:06 +0000 (UTC)
commit 158b8793bee8744b4ebd65735a0bd5b7e9c6c5d1
Author: Michael Natterer <mitch gimp org>
Date: Thu Jun 24 21:56:41 2010 +0200
Bug 622608 - GIMP crashes when clicking any scroll bar from combo boxes
Don't cancel the popup in grab_notify() if the popup's grab was
shadowed by one of the widgets in the popup, like the scrollbar.
app/widgets/gimpcontainerpopup.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/app/widgets/gimpcontainerpopup.c b/app/widgets/gimpcontainerpopup.c
index 7d2f003..9db8fdf 100644
--- a/app/widgets/gimpcontainerpopup.c
+++ b/app/widgets/gimpcontainerpopup.c
@@ -180,8 +180,14 @@ static void
gimp_container_popup_grab_notify (GtkWidget *widget,
gboolean was_grabbed)
{
- if (! was_grabbed)
- g_signal_emit (widget, popup_signals[CANCEL], 0);
+ if (was_grabbed)
+ return;
+
+ /* ignore grabs on one of our children, like the scrollbar */
+ if (gtk_widget_is_ancestor (gtk_grab_get_current (), widget))
+ return;
+
+ g_signal_emit (widget, popup_signals[CANCEL], 0);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]