summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-03-23 02:19:48 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-03-23 02:19:48 +0000
commitdafca1405e6fa342b5740e74be43f0969b4606c8 (patch)
tree4a3d3ea55e4d16d96bb1b7e8f0ba9e0460d10f62 /apps
parent7e84cca44131e07a0012129b9f5cc73bc5c5cb39 (diff)
downloadrockbox-dafca1405e6fa342b5740e74be43f0969b4606c8.tar.gz
rockbox-dafca1405e6fa342b5740e74be43f0969b4606c8.tar.bz2
rockbox-dafca1405e6fa342b5740e74be43f0969b4606c8.zip
revert r25271 which caused more problems than it tried to fix
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25296 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_display.c26
-rw-r--r--apps/gui/skin_engine/wps_internals.h1
-rw-r--r--apps/gui/statusbar-skinned.c2
3 files changed, 15 insertions, 14 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 8ea5dc5ecb..845ea18608 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -1123,10 +1123,11 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
struct skin_viewport *skin_viewport =
(struct skin_viewport *)viewport_list->token->value.data;
unsigned vp_refresh_mode = refresh_mode;
- unsigned hidden_flags = skin_viewport->hidden_flags;
display->set_viewport(&skin_viewport->vp);
+ int hidden_vp = 0;
+
#ifdef HAVE_LCD_BITMAP
/* Set images to not to be displayed */
struct skin_token_list *imglist = data->images;
@@ -1137,18 +1138,19 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
imglist = imglist->next;
}
#endif
- if ((hidden_flags&VP_NEVER_VISIBLE))
- {
- continue;
+ /* dont redraw the viewport if its disabled */
+ if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE)
+ { /* don't draw anything into this one */
+ vp_refresh_mode = 0; hidden_vp = true;
}
- if ((hidden_flags&VP_DRAW_HIDDEN))
+ else if ((skin_viewport->hidden_flags&VP_DRAW_HIDDEN))
{
- if (!(hidden_flags&VP_DRAW_WASHIDDEN))
+ if (!(skin_viewport->hidden_flags&VP_DRAW_WASHIDDEN))
display->scroll_stop(&skin_viewport->vp);
skin_viewport->hidden_flags |= VP_DRAW_WASHIDDEN;
continue;
}
- else if (((hidden_flags&
+ else if (((skin_viewport->hidden_flags&
(VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))
== (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)))
{
@@ -1158,8 +1160,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
if (vp_refresh_mode == WPS_REFRESH_ALL)
{
- if (!(hidden_flags&VP_NEVER_CLEAR))
- display->clear_viewport();
+ display->clear_viewport();
}
/* loop over the lines for this viewport */
@@ -1178,7 +1179,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
flags = line->curr_subline->line_type;
if (vp_refresh_mode == WPS_REFRESH_ALL || (flags & vp_refresh_mode)
- || new_subline_refresh)
+ || new_subline_refresh || hidden_vp)
{
/* get_line tells us if we need to update the line */
update_line = get_line(gwps, subline, &align,
@@ -1224,7 +1225,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
}
#endif
- if (update_line &&
+ if (update_line && !hidden_vp &&
/* conditionals clear the line which means if the %Vd is put into the default
viewport there will be a blank line.
To get around this we dont allow any actual drawing to happen in the
@@ -1253,7 +1254,8 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
}
}
/* Now display any images in this viewport */
- wps_display_images(gwps, &skin_viewport->vp);
+ if (!hidden_vp)
+ wps_display_images(gwps, &skin_viewport->vp);
#endif
}
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 839a066a2d..b0f5f36eb5 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -197,7 +197,6 @@ struct skin_line {
#define VP_DRAW_WASHIDDEN 0x4
/* these are never drawn, nor cleared, i.e. just ignored */
#define VP_NEVER_VISIBLE 0x8
-#define VP_NEVER_CLEAR 0x10
#define VP_DEFAULT_LABEL '|'
#define VP_NO_LABEL '-'
#define VP_INFO_LABEL '_'
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index 179e69661a..0902950599 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -85,7 +85,7 @@ void sb_skin_data_load(enum screen_type screen, const char *buf, bool isfile)
success = false;
}
/* hide this viewport, forever */
- vp->hidden_flags = VP_NEVER_CLEAR;
+ vp->hidden_flags = VP_NEVER_VISIBLE;
}
if (!success && isfile)