callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: merge if() madness into one single even bigger madness

Browse Source
This commit is contained in:
Michael Natterer
2011-12-09 22:34:44 +01:00
parent 5ec2bd7287
commit 7da455214d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,13 +453,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
state |= gimp_display_shell_button_to_state (bevent->button);
/* ignore new buttons while another button is down */
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)))
if (((state & (GDK_BUTTON1_MASK)) && (state & (GDK_BUTTON2_MASK |
GDK_BUTTON3_MASK))) ||
((state & (GDK_BUTTON2_MASK)) && (state & (GDK_BUTTON1_MASK |
GDK_BUTTON3_MASK))) ||
((state & (GDK_BUTTON3_MASK)) && (state & (GDK_BUTTON1_MASK |
GDK_BUTTON2_MASK))))
return TRUE;
/* focus the widget if it isn't; if the toplevel window