From 4aadb5237a27dee82c6660294d4e76aa0d17503e Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 3 Jan 2013 12:48:09 +0000 Subject: Ensure selection related keypresses go to whatever has claimed input. --- desktop/textinput.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'desktop') diff --git a/desktop/textinput.c b/desktop/textinput.c index 8efc71963..36daa374d 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -127,6 +127,12 @@ bool browser_window_key_press(struct browser_window *bw, uint32_t key) assert(bw->window != NULL); + if (focus->caret_callback) { + /* Pass keypress onto anything that has claimed input focus */ + return focus->caret_callback(focus, key, + focus->caret_p1, focus->caret_p2); + } + /* keys that take effect wherever the caret is positioned */ switch (key) { case KEY_SELECT_ALL: @@ -151,12 +157,7 @@ bool browser_window_key_press(struct browser_window *bw, uint32_t key) return false; } - /* pass on to the appropriate field */ - if (!focus->caret_callback) - return false; - - return focus->caret_callback(focus, key, - focus->caret_p1, focus->caret_p2); + return false; } -- cgit v1.2.3