Fixed tab issues and made use of lcd_clear_display instead of lcd_clearrect

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@391 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Hak 2002-05-02 21:50:34 +00:00
parent 4bcfec6846
commit 24df270e86

View file

@ -49,40 +49,40 @@ void ss_loop(void)
int y = LCD_HEIGHT/2; int y = LCD_HEIGHT/2;
int i = 0; int i = 0;
int center = 0; int center = 0;
int factor = 0; int factor = 0;
int offset = 0; int offset = 0;
if (LCD_HEIGHT < LCD_WIDTH) if (LCD_HEIGHT < LCD_WIDTH)
center = LCD_HEIGHT/2; center = LCD_HEIGHT/2;
else else
center = LCD_WIDTH/2; center = LCD_WIDTH/2;
i = center; i = center;
while(1) while(1)
{ {
/* Grow */ /* Grow */
if ( i <= 0 ) { if ( i <= 0 ) {
factor = 1; factor = 1;
i = 1; i = 1;
} }
/* Shrink */ /* Shrink */
if (i >= center) { if (i >= center) {
factor = -1; factor = -1;
i = center; i = center;
} }
offset=i*factor; offset=i*factor;
b = button_get(); b = button_get();
if ( b & BUTTON_OFF ) if ( b & BUTTON_OFF )
return; return;
lcd_clearrect(0, 0, LCD_WIDTH, LCD_HEIGHT); lcd_clear_display();
drawrect(x-offset, y-offset, x2+offset, y2+offset); drawrect(x-offset, y-offset, x2+offset, y2+offset);
lcd_update(); lcd_update();
i+=factor; i+=factor;
sleep(10); sleep(10);
} }
@ -91,55 +91,48 @@ void ss_loop(void)
void screensaver(void) void screensaver(void)
{ {
char w, h; char w, h;
char *off = "[Off] to stop"; char *off = "[Off] to stop";
int len = strlen(SS_TITLE); int len = strlen(SS_TITLE);
lcd_fontsize(SS_TITLE_FONT, &w, &h); lcd_fontsize(SS_TITLE_FONT, &w, &h);
/* Get horizontel centering for text */ /* Get horizontel centering for text */
len *= w; len *= w;
if (len%2 != 0) if (len%2 != 0)
len = ((len+1)/2)+(w/2); len = ((len+1)/2)+(w/2);
else else
len /= 2; len /= 2;
if (h%2 != 0) if (h%2 != 0)
h = (h/2)+1; h = (h/2)+1;
else else
h /= 2; h /= 2;
lcd_clearrect(0, 0, LCD_WIDTH, LCD_HEIGHT); lcd_clear_display();
lcd_puts(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT); lcd_puts(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT);
len = strlen(off); len = strlen(off);
lcd_fontsize(0, &w, &h); lcd_fontsize(0, &w, &h);
/* Get horizontel centering for text */ /* Get horizontel centering for text */
len *= w; len *= w;
if (len%2 != 0) if (len%2 != 0)
len = ((len+1)/2)+(w/2); len = ((len+1)/2)+(w/2);
else else
len /= 2; len /= 2;
if (h%2 != 0) if (h%2 != 0)
h = (h/2)+1; h = (h/2)+1;
else else
h /= 2; h /= 2;
lcd_puts(LCD_WIDTH/2-len, LCD_HEIGHT-(2*h), off, 0); lcd_puts(LCD_WIDTH/2-len, LCD_HEIGHT-(2*h), off, 0);
lcd_update(); lcd_update();
sleep(150); sleep(150);
ss_loop(); ss_loop();
} }