diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-04-05 13:00:05 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-04-05 15:01:59 +0200 |
| commit | bb0e4cc543e4c7bed6dff3a41d092b6867632535 (patch) | |
| tree | a62dca3c50fa09cfe609df088e9eee9bf2ac2853 /firmware | |
| parent | f458888a4c4fd8601ff4690388e2fc06fecb9fc2 (diff) | |
| download | rockbox-bb0e4cc543e4c7bed6dff3a41d092b6867632535.zip rockbox-bb0e4cc543e4c7bed6dff3a41d092b6867632535.tar.gz rockbox-bb0e4cc543e4c7bed6dff3a41d092b6867632535.tar.bz2 rockbox-bb0e4cc543e4c7bed6dff3a41d092b6867632535.tar.xz | |
touchscreen: Fix kinetic scrolling when the statusbar is off.
The scrolling code cannot differentiate between the BUTTON_TOUCHSCREEN post
from normal touches and the one posted in the timeout callback.
To fix introduce a global special button (BUTTON_REDRAW) that results
in the desired redraw. This existed already as a local kludge for android
and is now generalized.
Change-Id: I6bfa6c66431c48f5042fcd8fce2ea72cd3457f58
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/button.h | 12 | ||||
| -rw-r--r-- | firmware/target/hosted/android/app/button-target.h | 2 | ||||
| -rw-r--r-- | firmware/target/hosted/android/lcd-android.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 3f6052a..6276a03 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -81,13 +81,15 @@ void wheel_send_events(bool send); int button_apply_acceleration(const unsigned int data); #endif -#define BUTTON_NONE 0x00000000 +#define BUTTON_NONE 0x00000000 /* Button modifiers */ -#define BUTTON_REL 0x02000000 -#define BUTTON_REPEAT 0x04000000 -#define BUTTON_TOUCHSCREEN 0x08000000 -#define BUTTON_MULTIMEDIA 0x10000000 +#define BUTTON_REL 0x02000000 +#define BUTTON_REPEAT 0x04000000 +/* Special buttons */ +#define BUTTON_TOUCHSCREEN 0x08000000 +#define BUTTON_MULTIMEDIA 0x10000000 +#define BUTTON_REDRAW 0x20000000 #define BUTTON_MULTIMEDIA_PLAYPAUSE (BUTTON_MULTIMEDIA|0x01) #define BUTTON_MULTIMEDIA_STOP (BUTTON_MULTIMEDIA|0x02) diff --git a/firmware/target/hosted/android/app/button-target.h b/firmware/target/hosted/android/app/button-target.h index 326d658..5430d7f 100644 --- a/firmware/target/hosted/android/app/button-target.h +++ b/firmware/target/hosted/android/app/button-target.h @@ -56,6 +56,4 @@ void android_ignore_back_button(bool yes); #define BUTTON_BOTTOMMIDDLE 0x00080000 #define BUTTON_BOTTOMRIGHT 0x00100000 -#define BUTTON_FORCE_REDRAW 0x00200000 - #endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index bb0331d..2b38374 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c @@ -146,7 +146,7 @@ Java_org_rockbox_RockboxFramebuffer_surfaceCreated(JNIEnv *env, jobject this, send_event(LCD_EVENT_ACTIVATION, NULL); /* Force an update, since the newly created surface is initially black * waiting for the next normal update results in a longish black screen */ - queue_post(&button_queue, BUTTON_FORCE_REDRAW, 0); + queue_post(&button_queue, BUTTON_REDRAW, 0); } /* |