devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#9051 - remove LCD margins... use viewports if you need them...

Browse source 
NOTE to WPS people....
%m has been removed, but (i think) because of the other %m tags it wont fail if you try loading a wps with %m|..|, it will just be ignored.
Also note that if the statusbar is enabled the default viewport is 8 pixels shorter than when its not, i.e (0,0) is really (0,8) if the statusbar is shown... I dont think this will be a major issue because almost no WPS show the bar and use bitmaps... text only WPS shouldnt be affected.

Please report problem screens in http://forums.rockbox.org/index.php?topic=17358.0


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17763 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-06-23 13:20:35 +00:00
parent c1b8df05e1
commit bdbdb97f19
38 changed files with 145 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

26
firmware/drivers/lcd-charcell.c
View file

@ -58,8 +58,6 @@ static struct viewport default_vp =
.y = 0,
.width = LCD_WIDTH,
.height = LCD_HEIGHT,
.xmargin = 0,
.ymargin = 0,
};
static struct viewport* current_vp = &default_vp;
@ -92,22 +90,6 @@ void lcd_update_viewport(void)
/** parameter handling **/
void lcd_setmargins(int x, int y)
{
current_vp->xmargin = x;
current_vp->ymargin = y;
}
int lcd_getxmargin(void)
{
return current_vp->xmargin;
}
int lcd_getymargin(void)
{
return current_vp->ymargin;
}
int lcd_getwidth(void)
{
return current_vp->width;
@ -484,7 +466,7 @@ void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
lcd_puts_offset(x, y, string, offset);
len = utf8length(string);
if (current_vp->width - x - current_vp->xmargin < len)
if (current_vp->width - x < len)
{
/* prepare scroll line */
char *end;
@ -498,7 +480,7 @@ void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
/* scroll bidirectional or forward only depending on the string width */
if (lcd_scroll_info.bidir_limit)
{
s->bidir = s->len < (current_vp->width - current_vp->xmargin) *
s->bidir = s->len < (current_vp->width) *
(100 + lcd_scroll_info.bidir_limit) / 100;
}
else
@ -517,7 +499,7 @@ void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
s->vp = current_vp;
s->y = y;
s->offset = offset;
s->startx = current_vp->xmargin + x;
s->startx = x;
s->backward = false;
lcd_scroll_info.lines++;
}
@ -547,7 +529,7 @@ void lcd_scroll_fn(void)
s->offset++;
xpos = s->startx;
ypos = current_vp->ymargin + s->y;
ypos = s->y;
if (s->bidir) /* scroll bidirectional */
{