From bb0e4cc543e4c7bed6dff3a41d092b6867632535 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 5 Apr 2012 13:00:05 +0200 Subject: 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 --- apps/action.c | 4 ++++ apps/gui/bitmap/list.c | 2 +- apps/keymaps/keymap-android.c | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/action.c b/apps/action.c index ee6cbaa..5ebcbf7 100644 --- a/apps/action.c +++ b/apps/action.c @@ -233,6 +233,10 @@ static int get_action_worker(int context, int timeout, * multimedia button presses don't go through the action system */ if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA)) return button; + /* the special redraw button should result in a screen refresh */ + if (button == BUTTON_REDRAW) + return ACTION_REDRAW; + /* Don't send any buttons through untill we see the release event */ if (wait_for_release) { diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index 09a66f3..2f13d8b 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c @@ -587,7 +587,7 @@ static int kinetic_callback(struct timeout *tmo) data->velocity = 0; } - queue_post(&button_queue, BUTTON_TOUCHSCREEN, 0); + queue_post(&button_queue, BUTTON_REDRAW, 0); /* stop if the velocity hit or crossed zero */ if (!data->velocity) { diff --git a/apps/keymaps/keymap-android.c b/apps/keymaps/keymap-android.c index b7b93ac..ea1abbc 100644 --- a/apps/keymaps/keymap-android.c +++ b/apps/keymaps/keymap-android.c @@ -50,9 +50,6 @@ static const struct button_mapping button_context_standard[] = { { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, - /* special hack to get a redraw on activity resume, see lcd-android.c */ - { ACTION_REDRAW, BUTTON_FORCE_REDRAW, BUTTON_NONE }, - LAST_ITEM_IN_LIST }; /* button_context_standard */ -- cgit v1.1