len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scroll_engine: Add STYLE_NONE to allow for drawing lines without styling.

Browse source 
This allows to draw lines without destroying styles that were drawn manually
(e.g. from apps/) beforehand.

Change-Id: I0de290c9343061efb115e1b76da5b76395c2b2af
This commit is contained in:
Thomas Martitz 2013-04-12 07:27:08 +02:00
parent b094d80dab
commit 26801b3bd8
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/drivers/lcd-bitmap-common.c
View file

@ -360,6 +360,12 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos,
int text_ypos = ypos;
int line_height = font_get(current_vp->font)->height;
text_ypos += h/2 - line_height/2; /* center the text in the line */
if ((style & STYLE_MODE_MASK) == STYLE_NONE) {
if (str[0])
LCDFN(putsxyofs)(xpos, text_ypos, offset, str);
return;
}
#if defined(MAIN_LCD) && defined(HAVE_LCD_COLOR)
int oldfgcolor = current_vp->fg_pattern;
int oldbgcolor = current_vp->bg_pattern;

3
firmware/export/lcd-remote.h
View file

@ -37,9 +37,6 @@
int remote_type(void);
#endif
#define STYLE_DEFAULT 0x00000000
#define STYLE_INVERT 0x20000000
#if LCD_REMOTE_DEPTH <= 8
#if (LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED) \
|| (LCD_REMOTE_PIXELFORMAT == HORIZONTAL_INTERLEAVED)

13
firmware/export/lcd.h
View file

@ -119,12 +119,13 @@ enum screen_type {
#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \
(h)):STRIDE_REMOTE((w),(h)))
#define STYLE_DEFAULT 0x00000000
#define STYLE_COLORED 0x10000000
#define STYLE_INVERT 0x20000000
#define STYLE_COLORBAR 0x40000000
#define STYLE_GRADIENT 0x80000000
#define STYLE_MODE_MASK 0xF0000000
#define STYLE_NONE 0x00000000
#define STYLE_DEFAULT 0x01000000
#define STYLE_COLORED 0x02000000
#define STYLE_INVERT 0x04000000
#define STYLE_COLORBAR 0x08000000
#define STYLE_GRADIENT 0x10000000
#define STYLE_MODE_MASK 0xFF000000
/* HACK: This isnt really a style, We need to be able to tell some of
* the lcd API that we want to draw text to a specific pixel instead
* of a char. Remove this hack when the whole LCD api goes to fully