summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-02-05 08:21:54 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-02-05 08:21:54 +0000
commit7ca3ccd2a4f0e98265bb1a2f4c891489671a5790 (patch)
tree875ab7347cc3a13bb3c5e58d8665ceeb4637a72f /apps/gui
parentc3e73a5f9ee1ec7d0759ee3ce27954e6e653a698 (diff)
quiet the masses...
stop the wps scrolling happening in the quickscreen green delta for non quickscreen targets nfi why colours arnt working... hopefully bug in firmware/? git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16222 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/option_select.c2
-rw-r--r--apps/gui/quickscreen.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index b4b1b716bb..5dec9f7216 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -211,6 +211,7 @@ static int option_talk(int selected_item, void * data)
return 0;
}
+#ifdef HAVE_QUICKSCREEN /* only the quickscreen uses this so far */
void option_select_next_val(struct settings_list *setting)
{
int val = 0;
@@ -246,6 +247,7 @@ void option_select_next_val(struct settings_list *setting)
}
*value = val;
}
+#endif
static int selection_to_val(struct settings_list *setting, int selection)
{
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index f0eafb7299..f98c926e91 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -268,6 +268,8 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
gui_syncstatusbar_draw(&statusbars, true);
FOR_NB_SCREENS(i)
{
+ screens[i].set_viewport(NULL);
+ screens[i].scroll_stop(NULL);
vp[i].x = 0;
vp[i].width = screens[i].width;
vp[i].y = STATUSBAR_HEIGHT;
@@ -275,8 +277,8 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
#ifdef HAVE_LCD_COLOR
if (screens[i].is_color)
{
- vp[i].fg_pattern = screens[i].get_foreground();
- vp[i].bg_pattern = screens[i].get_background();
+ vp[i].fg_pattern = global_settings.fg_color;
+ vp[i].bg_pattern = global_settings.bg_color;
}
#endif
vp[i].xmargin = 0;