dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: improve ignoring other buttons while one down

Browse source
This commit is contained in:
Alexia Death 2011-12-09 23:26:22 +02:00
parent 435b5b4386
commit 5ec2bd7287
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/display/gimpdisplayshell-tool-events.c
View file

@ -447,11 +447,19 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
GimpTool *active_tool;
/* ignore new mouse events */
if (gimp->busy || shell->scrolling)
if (gimp->busy || shell->scrolling || shell->pointer_grabbed)
return TRUE;
state |= gimp_display_shell_button_to_state (bevent->button);
/* ignore new buttons while another button is down */
if (state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK))
if ((state & (GDK_BUTTON1_MASK)) && (state & (GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
return TRUE;
if ((state & (GDK_BUTTON2_MASK)) && (state & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK)))
return TRUE;
if ((state & (GDK_BUTTON3_MASK)) && (state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK)))
return TRUE;
/* focus the widget if it isn't; if the toplevel window
@ -475,8 +483,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
active_tool = tool_manager_get_active (gimp);
state |= gimp_display_shell_button_to_state (bevent->button);
if (gdk_event_triggers_context_menu (event))
{
GimpUIManager *ui_manager;