[gimp/gtk3-port: 2/226] 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/226] Revert "app: Fix on canvas widgets ignoring clicks from tablets - bug 614441"
- Date: Sat, 11 Oct 2014 18:19:15 +0000 (UTC)
commit ec1b3924d858f1fdec932a43257c4c3b63d78545
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 | 18 +-----------------
app/display/gimpdisplayshell.h | 2 --
2 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 0fe9d7d..ec54e96 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -339,9 +339,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
display, gimp_print_event (event));
/* 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;
@@ -369,13 +367,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{
GdkEventCrossing *cevent = (GdkEventCrossing *) event;
- if (shell->inferior_ignore_mode)
- {
- shell->inferior_ignore_mode = FALSE;
- gtk_widget_set_extension_events (shell->canvas,
- GDK_EXTENSION_EVENTS_ALL);
- }
-
if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE;
@@ -397,13 +388,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{
GdkEventCrossing *cevent = (GdkEventCrossing *) event;
- if (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 b49e02c..4077cfa 100644
--- a/app/display/gimpdisplayshell.h
+++ b/app/display/gimpdisplayshell.h
@@ -176,8 +176,6 @@ struct _GimpDisplayShell
gboolean keyboard_grabbed;
guint32 keyboard_grab_time;
- gboolean inferior_ignore_mode;
-
gboolean space_pressed;
gboolean space_release_pending;
const gchar *space_shaded_tool;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]