[gimp/gtk3-port: 2/444] Revert "app: Fix on canvas widgets ignoring clicks from tablets - bug 614441"
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 2/444] Revert "app: Fix on canvas widgets ignoring clicks from tablets - bug 614441"
- Date: Sun, 13 May 2018 19:59:42 +0000 (UTC)
commit 96a38d630c976db3fed59ae07c116372e3434eb6
Author: Michael Natterer <mitch gimp org>
Date: Mon Feb 10 22:41:05 2014 +0100
Revert "app: Fix on canvas widgets ignoring clicks from tablets - bug 614441"
This reverts commit a059c0e7eb73329e1e2661de2b44864531ea1a6b.
app/display/gimpdisplayshell-tool-events.c | 23 +----------------------
app/display/gimpdisplayshell.h | 2 --
2 files changed, 1 insertions(+), 24 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 4325bf3..bd00e86 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -538,9 +538,7 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas,
}
/* Find out what device the event occurred upon */
- if (! gimp->busy &&
- ! shell->inferior_ignore_mode &&
- gimp_devices_check_change (gimp, event))
+ if (! gimp->busy && gimp_devices_check_change (gimp, event))
{
gimp_display_shell_check_device_cursor (shell);
device_changed = TRUE;
@@ -568,15 +566,6 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas,
{
GdkEventCrossing *cevent = (GdkEventCrossing *) event;
- if (shell->inferior_ignore_mode &&
- cevent->subwindow == NULL &&
- cevent->mode == GDK_CROSSING_NORMAL)
- {
- shell->inferior_ignore_mode = FALSE;
- gtk_widget_set_extension_events (shell->canvas,
- GDK_EXTENSION_EVENTS_ALL);
- }
-
if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE;
@@ -598,16 +587,6 @@ gimp_display_shell_canvas_tool_events_internal (GtkWidget *canvas,
{
GdkEventCrossing *cevent = (GdkEventCrossing *) event;
- if (! shell->inferior_ignore_mode &&
- cevent->subwindow == NULL &&
- cevent->mode == GDK_CROSSING_NORMAL &&
- cevent->detail == GDK_NOTIFY_INFERIOR)
- {
- shell->inferior_ignore_mode = TRUE;
- gtk_widget_set_extension_events (shell->canvas,
- GDK_EXTENSION_EVENTS_NONE);
- }
-
if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE;
diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h
index b00f975..c9d9a00 100644
--- a/app/display/gimpdisplayshell.h
+++ b/app/display/gimpdisplayshell.h
@@ -187,8 +187,6 @@ struct _GimpDisplayShell
gboolean keyboard_grabbed;
guint32 keyboard_grab_time;
- gboolean inferior_ignore_mode;
-
/* Two states are possible when the shell is grabbed: it can be
* grabbed with space (or space+button1 which is the same state),
* then if space is released but button1 was still pressed, we wait
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]