diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-04-30 07:41:05 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 14:13:48 +0100 |
commit | e1c7b3b8f72becc9079c04253a2985f577850a48 (patch) | |
tree | 84358cf14d067ab5089813d3778a96bfbaa66670 /apps/gui | |
parent | deb6ac3693a6fb5c47abd0c32f966f5e38b6a68a (diff) | |
download | rockbox-e1c7b3b8f72becc9079c04253a2985f577850a48.tar.gz rockbox-e1c7b3b8f72becc9079c04253a2985f577850a48.zip |
lcd-16bit: Remove {lss,lse,lst}_pattern fields from struct viewport.
These where used for line styling during scrolling, which is now done in apps/,
The viewport struct doesn't need to record these anymore.
Change-Id: I810d9dcb2644b00a798c6e75acab69c74a78e77f
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 6 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 5 | ||||
-rw-r--r-- | apps/gui/viewport.c | 5 |
3 files changed, 3 insertions, 13 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 1945bfbc57..1946e179c0 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1957,9 +1957,9 @@ static int convert_viewport(struct wps_data *data, struct skin_element* element) | |||
1957 | skin_vp->start_bgcolour = skin_vp->vp.bg_pattern; | 1957 | skin_vp->start_bgcolour = skin_vp->vp.bg_pattern; |
1958 | #endif | 1958 | #endif |
1959 | #ifdef HAVE_LCD_COLOR | 1959 | #ifdef HAVE_LCD_COLOR |
1960 | skin_vp->start_gradient.start = skin_vp->vp.lss_pattern; | 1960 | skin_vp->start_gradient.start = global_settings.lss_color; |
1961 | skin_vp->start_gradient.end = skin_vp->vp.lse_pattern; | 1961 | skin_vp->start_gradient.end = global_settings.lse_color; |
1962 | skin_vp->start_gradient.text = skin_vp->vp.lst_pattern; | 1962 | skin_vp->start_gradient.text = global_settings.lst_color; |
1963 | #endif | 1963 | #endif |
1964 | 1964 | ||
1965 | 1965 | ||
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index f40c3b90e0..43914699d6 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -859,11 +859,6 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) | |||
859 | skin_backdrop_show(data->backdrop_id); | 859 | skin_backdrop_show(data->backdrop_id); |
860 | } | 860 | } |
861 | #endif | 861 | #endif |
862 | #ifdef HAVE_LCD_COLOR | ||
863 | skin_viewport->vp.lss_pattern = skin_viewport->start_gradient.start; | ||
864 | skin_viewport->vp.lse_pattern = skin_viewport->start_gradient.end; | ||
865 | skin_viewport->vp.lst_pattern = skin_viewport->start_gradient.text; | ||
866 | #endif | ||
867 | 862 | ||
868 | /* dont redraw the viewport if its disabled */ | 863 | /* dont redraw the viewport if its disabled */ |
869 | if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE) | 864 | if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE) |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index b91c7441dd..aeb884a95d 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -329,11 +329,6 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
329 | { | 329 | { |
330 | vp->fg_pattern = FG_FALLBACK; | 330 | vp->fg_pattern = FG_FALLBACK; |
331 | vp->bg_pattern = BG_FALLBACK; | 331 | vp->bg_pattern = BG_FALLBACK; |
332 | #ifdef HAVE_LCD_COLOR | ||
333 | vp->lss_pattern = global_settings.lss_color; | ||
334 | vp->lse_pattern = global_settings.lse_color; | ||
335 | vp->lst_pattern = global_settings.lst_color; | ||
336 | #endif | ||
337 | } | 332 | } |
338 | #endif | 333 | #endif |
339 | 334 | ||