summaryrefslogtreecommitdiff
path: root/apps/gui/line.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-04-16 23:47:17 +0200
committerThomas Martitz <kugel@rockbox.org>2014-01-07 14:13:48 +0100
commit36e469db8bb7789c89ff642b51c1471669b830f5 (patch)
tree14e40cf0b2258dfe34a2fbf5a436db5de2abcdd1 /apps/gui/line.c
parentad0985ea1c4841498084dc3bc2158492f207e6fb (diff)
downloadrockbox-36e469db8bb7789c89ff642b51c1471669b830f5.tar.gz
rockbox-36e469db8bb7789c89ff642b51c1471669b830f5.zip
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
Diffstat (limited to 'apps/gui/line.c')
-rw-r--r--apps/gui/line.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/gui/line.c b/apps/gui/line.c
index 9374279b60..3d563d171c 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -264,7 +264,6 @@ static void style_line(struct screen *display,
264 int style = line->style; 264 int style = line->style;
265 int width = display->getwidth(); 265 int width = display->getwidth();
266 int height = line->height == -1 ? display->getcharheight() : line->height; 266 int height = line->height == -1 ? display->getcharheight() : line->height;
267 unsigned mask = STYLE_MODE_MASK & ~STYLE_COLORED;
268 267
269 /* mask out gradient and colorbar styles for non-color displays */ 268 /* mask out gradient and colorbar styles for non-color displays */
270 if (display->depth < 16) 269 if (display->depth < 16)
@@ -277,7 +276,7 @@ static void style_line(struct screen *display,
277 style &= ~STYLE_COLORED; 276 style &= ~STYLE_COLORED;
278 } 277 }
279 278
280 switch (style & mask) 279 switch (style & _STYLE_DECO_MASK)
281 { 280 {
282#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1)) 281#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
283 case STYLE_GRADIENT: 282 case STYLE_GRADIENT: