dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "app: Fix on canvas widgets ignoring clicks from tablets - bug 614441" 

This reverts commit a059c0e7eb.
This commit is contained in:
Michael Natterer 2014-02-10 22:41:05 +01:00
parent dbd9797a13
commit bb0eb4a7c3
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/display/gimpdisplayshell-tool-events.c
View File

@ -539,9 +539,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;
@ -569,15 +567,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;
@ -599,16 +588,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;

2
app/display/gimpdisplayshell.h
View File

@ -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