From e1c7b3b8f72becc9079c04253a2985f577850a48 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 30 Apr 2013 07:41:05 +0200 Subject: 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 --- apps/gui/skin_engine/skin_parser.c | 6 +++--- apps/gui/skin_engine/skin_render.c | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'apps/gui/skin_engine') 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) skin_vp->start_bgcolour = skin_vp->vp.bg_pattern; #endif #ifdef HAVE_LCD_COLOR - skin_vp->start_gradient.start = skin_vp->vp.lss_pattern; - skin_vp->start_gradient.end = skin_vp->vp.lse_pattern; - skin_vp->start_gradient.text = skin_vp->vp.lst_pattern; + skin_vp->start_gradient.start = global_settings.lss_color; + skin_vp->start_gradient.end = global_settings.lse_color; + skin_vp->start_gradient.text = global_settings.lst_color; #endif 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) skin_backdrop_show(data->backdrop_id); } #endif -#ifdef HAVE_LCD_COLOR - skin_viewport->vp.lss_pattern = skin_viewport->start_gradient.start; - skin_viewport->vp.lse_pattern = skin_viewport->start_gradient.end; - skin_viewport->vp.lst_pattern = skin_viewport->start_gradient.text; -#endif /* dont redraw the viewport if its disabled */ if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE) -- cgit v1.2.3