diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-02-28 13:06:30 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-02-28 13:06:30 +0000 |
commit | 5baf48859a71060bbe6e81335431fcda6c91a0f8 (patch) | |
tree | 5ad5eb675142bf2703e6cfd34f7bfeaae5bffb2d /riscos/window.c | |
parent | 947c466c4ba63ad84c0121453975a34935d0c1e8 (diff) | |
parent | 2ce332f1b07af89ce387ca24cc6471f97c80154b (diff) | |
download | netsurf-5baf48859a71060bbe6e81335431fcda6c91a0f8.tar.gz netsurf-5baf48859a71060bbe6e81335431fcda6c91a0f8.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/bitmap-fonts
Diffstat (limited to 'riscos/window.c')
-rw-r--r-- | riscos/window.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/riscos/window.c b/riscos/window.c index f6ebf14d4..6a2ae4467 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -4878,9 +4878,10 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, /* Need to consider what we have and decide whether to fire * triple click instead */ - switch (state) { - case BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_CLICK_1: - case BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_CLICK_2: + if ((state == (BROWSER_MOUSE_PRESS_1 | + BROWSER_MOUSE_CLICK_1)) || + (state == (BROWSER_MOUSE_PRESS_2 | + BROWSER_MOUSE_CLICK_2))) { /* WIMP told us single click, but maybe we want to call * it a triple click */ @@ -4899,12 +4900,12 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, /* Single click */ last_click.type = CLICK_SINGLE; } - break; - - case BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_CLICK_1 | - BROWSER_MOUSE_DOUBLE_CLICK: - case BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_CLICK_2 | - BROWSER_MOUSE_DOUBLE_CLICK: + } else if ((state == (BROWSER_MOUSE_PRESS_1 | + BROWSER_MOUSE_CLICK_1 | + BROWSER_MOUSE_DOUBLE_CLICK)) || + (state == (BROWSER_MOUSE_PRESS_2 | + BROWSER_MOUSE_CLICK_2 | + BROWSER_MOUSE_DOUBLE_CLICK))) { /* Wimp told us double click, but we may want to * call it single click */ @@ -4915,11 +4916,8 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, last_click.type = CLICK_DOUBLE; last_click.time = wallclock(); } - break; - - default: + } else { last_click.type = CLICK_SINGLE; - break; } break; } |