diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-16 23:48:46 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-16 19:57:28 -0400 |
commit | b309fae2bc9a505fa9da0c0188b23108938d2998 (patch) | |
tree | 2abd3aa4195e7bbf561f9b09418f69862f71a02f | |
parent | 67f7d399e5dd3280a2e5126d1b2d673447dc3aba (diff) | |
download | rockbox-b309fae2bc9a505fa9da0c0188b23108938d2998.tar.gz rockbox-b309fae2bc9a505fa9da0c0188b23108938d2998.zip |
touchscreen: fix quickscreen
Looks like I made a mistake testing this originally because there's
no way this would've worked.
Change-Id: I89dc0d831e381eb957cf6e1a801236b5cd829efa
-rw-r--r-- | apps/gui/quickscreen.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index a7d07f4e33..e403e13e6c 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -288,14 +288,22 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button) | |||
288 | static int quickscreen_touchscreen_button(void) | 288 | static int quickscreen_touchscreen_button(void) |
289 | { | 289 | { |
290 | short x,y; | 290 | short x,y; |
291 | /* only hitting the text counts, everything else is exit */ | ||
292 | if (action_get_touchscreen_press(&x, &y) != BUTTON_REL) | 291 | if (action_get_touchscreen_press(&x, &y) != BUTTON_REL) |
293 | return ACTION_NONE; | 292 | return ACTION_NONE; |
294 | 293 | ||
295 | enum { left=1, right=2, top=4, bottom=8 }; | 294 | enum { left=1, right=2, top=4, bottom=8 }; |
296 | 295 | ||
297 | int bits = (x < LCD_WIDTH/3 ? left : (x > 2*LCD_WIDTH/3 ? 2 : right)) | | 296 | int bits = 0; |
298 | (y < LCD_WIDTH/3 ? top : (y > 2*LCD_WIDTH/3 ? 8 : bottom)); | 297 | |
298 | if(x < LCD_WIDTH/3) | ||
299 | bits |= left; | ||
300 | else if(x > 2*LCD_WIDTH/3) | ||
301 | bits |= right; | ||
302 | |||
303 | if(y < LCD_HEIGHT/3) | ||
304 | bits |= top; | ||
305 | else if(y > 2*LCD_HEIGHT/3) | ||
306 | bits |= bottom; | ||
299 | 307 | ||
300 | switch(bits) { | 308 | switch(bits) { |
301 | case top: | 309 | case top: |