summaryrefslogtreecommitdiff
path: root/riscos/window.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-02-13 22:41:24 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2013-02-13 22:41:24 +0000
commitf72d4319bbe6004c86589b00c3b31b484172cd00 (patch)
tree77a600591af1d1980e6c1ce385ff9ba5172cb366 /riscos/window.c
parent553c55b07a4aeb190f18806058f51ce2a10d9dd6 (diff)
downloadnetsurf-f72d4319bbe6004c86589b00c3b31b484172cd00.tar.gz
netsurf-f72d4319bbe6004c86589b00c3b31b484172cd00.tar.bz2
Changing browser window to get wimp double clicks meant enum value for single clicks was different. This broke the window taking focus on a single click. Fixed.
Diffstat (limited to 'riscos/window.c')
-rw-r--r--riscos/window.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/riscos/window.c b/riscos/window.c
index 23b2ee8d6..2ad5426e7 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1768,8 +1768,7 @@ bool ro_gui_window_click(wimp_pointer *pointer)
ro_gui_url_complete_close();
/* set input focus */
- if (pointer->buttons == wimp_CLICK_SELECT ||
- pointer->buttons == wimp_CLICK_ADJUST)
+ if (pointer->buttons & (wimp_SINGLE_SELECT | wimp_SINGLE_ADJUST))
gui_window_place_caret(g, -100, -100, 0);
if (ro_gui_window_to_window_pos(g, pointer->pos.x, pointer->pos.y, &pos))
@@ -4953,7 +4952,7 @@ browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons,
browser_mouse_state state = 0; /* Blank state with nothing set */
/* If mouse buttons aren't held, turn off drags */
- if (!(buttons & (wimp_CLICK_SELECT) || buttons & (wimp_CLICK_ADJUST))) {
+ if (!(buttons & (wimp_CLICK_SELECT | wimp_CLICK_ADJUST))) {
mouse_drag_select = false;
mouse_drag_adjust = false;
}