1
0
Fork 0
forked from len0rd/rockbox

lcd-common: Remove direct style (line decorations) from lcd-puts* functions.

This logic is moved into apps (put_line()) which can better handle line
decorations with respect to scrolling, mulitline and other complications.

Firmware doesn't need this. The remaining drawing function know only one style,
that is foreground on background/backdrop (changing drawmode is still supported).

Change-Id: I707060edc388a7d723a7d09b0cf5cbda6ec56708
This commit is contained in:
Thomas Martitz 2013-04-16 23:47:17 +02:00
parent ad0985ea1c
commit 36e469db8b
5 changed files with 41 additions and 156 deletions

View file

@ -264,7 +264,6 @@ static void style_line(struct screen *display,
int style = line->style;
int width = display->getwidth();
int height = line->height == -1 ? display->getcharheight() : line->height;
unsigned mask = STYLE_MODE_MASK & ~STYLE_COLORED;
/* mask out gradient and colorbar styles for non-color displays */
if (display->depth < 16)
@ -277,7 +276,7 @@ static void style_line(struct screen *display,
style &= ~STYLE_COLORED;
}
switch (style & mask)
switch (style & _STYLE_DECO_MASK)
{
#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
case STYLE_GRADIENT: