summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-10-11 01:19:55 +0000
committerThomas Martitz <kugel@rockbox.org>2010-10-11 01:19:55 +0000
commit3022a60cc2c5958555743f9438b8cf7cd95987f0 (patch)
tree18dc395d0d9cb1895fa831fbe92ae48ab7438d04 /apps/gui
parent1f0ab7c9e636ba3e88700b1b6fb75e876a0f0a44 (diff)
downloadrockbox-3022a60cc2c5958555743f9438b8cf7cd95987f0.tar.gz
rockbox-3022a60cc2c5958555743f9438b8cf7cd95987f0.zip
Rename {draw,fill}_viewport once more (to draw_border_viewport and fill_viewport) and remove the viewport parameter as suggested by Dave Chapman.
The parameter wasn't used yet and it's not clear whether it should be a absolute or relative viewport. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28242 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/buttonbar.c2
-rw-r--r--apps/gui/splash.c4
-rw-r--r--apps/gui/statusbar.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c
index 9abd851252..c7b36fa6e3 100644
--- a/apps/gui/buttonbar.c
+++ b/apps/gui/buttonbar.c
@@ -69,7 +69,7 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
69 vp.width = button_width-1; 69 vp.width = button_width-1;
70 vp.x = button_width * num; 70 vp.x = button_width * num;
71 display->set_viewport(&vp); 71 display->set_viewport(&vp);
72 display->fill_viewport_rect(NULL); 72 display->fill_viewport();
73 if(buttonbar->caption[num][0] != 0) 73 if(buttonbar->caption[num][0] != 0)
74 { 74 {
75 display->getstringsize(buttonbar->caption[num], &fw, &fh); 75 display->getstringsize(buttonbar->caption[num], &fw, &fh);
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 5123e5d8f5..4ce751ca74 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -163,7 +163,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
163#endif 163#endif
164 vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID); 164 vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
165 165
166 screen->fill_viewport_rect(NULL); 166 screen->fill_viewport();
167 167
168#if LCD_DEPTH > 1 168#if LCD_DEPTH > 1
169 if (screen->depth > 1) 169 if (screen->depth > 1)
@@ -174,7 +174,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
174#endif 174#endif
175 vp.drawmode = DRMODE_SOLID; 175 vp.drawmode = DRMODE_SOLID;
176 176
177 screen->draw_viewport_rect(NULL); 177 screen->draw_border_viewport();
178 178
179 /* prepare putting the text */ 179 /* prepare putting the text */
180 y = RECT_SPACING; 180 y = RECT_SPACING;
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 467907c21a..d2b7f500b1 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -280,7 +280,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
280 { 280 {
281 display->set_viewport(vp); 281 display->set_viewport(vp);
282 display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); 282 display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
283 display->fill_viewport_rect(NULL); 283 display->fill_viewport();
284 display->set_drawmode(DRMODE_SOLID); 284 display->set_drawmode(DRMODE_SOLID);
285 285
286 if (bar->info.battery_state) 286 if (bar->info.battery_state)