summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-02-26 06:17:04 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-02-26 06:17:04 +0000
commitcf6be66db61f679185ae38f0f9267717f26120c7 (patch)
treeb9b60d35e4c02c66b15e0535227a07217bfd883e /apps
parent466e5d9aa4fcdc3da6172eb9ae125fd4157be0b9 (diff)
downloadrockbox-cf6be66db61f679185ae38f0f9267717f26120c7.tar.gz
rockbox-cf6be66db61f679185ae38f0f9267717f26120c7.zip
small change to how the quickscreen fixes its viewports
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24918 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/quickscreen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 87d1514d18..d092f0b04a 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -175,13 +175,13 @@ static void gui_quickscreen_draw(const struct gui_quickscreen *qs,
175 int temp; 175 int temp;
176 display->set_viewport(parent); 176 display->set_viewport(parent);
177 display->clear_viewport(); 177 display->clear_viewport();
178
178 for (i = 0; i < QUICKSCREEN_ITEM_COUNT; i++) 179 for (i = 0; i < QUICKSCREEN_ITEM_COUNT; i++)
179 { 180 {
180 struct viewport *vp = &vps[i]; 181 struct viewport *vp = &vps[i];
181 if (!qs->items[i]) 182 if (!qs->items[i])
182 continue; 183 continue;
183 display->set_viewport(vp); 184 display->set_viewport(vp);
184 display->scroll_stop(vp);
185 185
186 title = P2STR(ID2P(qs->items[i]->lang_id)); 186 title = P2STR(ID2P(qs->items[i]->lang_id));
187 setting = qs->items[i]->setting; 187 setting = qs->items[i]->setting;
@@ -200,7 +200,6 @@ static void gui_quickscreen_draw(const struct gui_quickscreen *qs,
200 display->puts_scroll(0, 0, title); 200 display->puts_scroll(0, 0, title);
201 display->puts_scroll(0, 1, value); 201 display->puts_scroll(0, 1, value);
202 } 202 }
203 display->update_viewport();
204 } 203 }
205 /* draw the icons */ 204 /* draw the icons */
206 display->set_viewport(vp_icons); 205 display->set_viewport(vp_icons);
@@ -318,7 +317,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente
318 { 317 {
319 screens[i].set_viewport(NULL); 318 screens[i].set_viewport(NULL);
320 screens[i].stop_scroll(); 319 screens[i].stop_scroll();
321 viewport_set_defaults(&parent[i], i); 320 viewportmanager_theme_enable(i, true, &parent[i]);
322 quickscreen_fix_viewports(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]); 321 quickscreen_fix_viewports(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]);
323 gui_quickscreen_draw(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]); 322 gui_quickscreen_draw(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]);
324 } 323 }
@@ -363,6 +362,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente
363 { /* stop scrolling before exiting */ 362 { /* stop scrolling before exiting */
364 for (j = 0; j < QUICKSCREEN_ITEM_COUNT; j++) 363 for (j = 0; j < QUICKSCREEN_ITEM_COUNT; j++)
365 screens[i].scroll_stop(&vps[i][j]); 364 screens[i].scroll_stop(&vps[i][j]);
365 viewportmanager_theme_undo(i, true);
366 } 366 }
367 367
368 return changed; 368 return changed;