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

revert r25271 which caused more problems than it tried to fix

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25296 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-03-23 02:19:48 +00:00
parent 7e84cca441
commit dafca1405e
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
apps/gui/skin_engine/skin_display.c
View file

@ -1123,10 +1123,11 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
struct skin_viewport *skin_viewport = struct skin_viewport *skin_viewport =
(struct skin_viewport *)viewport_list->token->value.data; (struct skin_viewport *)viewport_list->token->value.data;
unsigned vp_refresh_mode = refresh_mode; unsigned vp_refresh_mode = refresh_mode;
unsigned hidden_flags = skin_viewport->hidden_flags;
display->set_viewport(&skin_viewport->vp); display->set_viewport(&skin_viewport->vp);
int hidden_vp = 0;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
/* Set images to not to be displayed */ /* Set images to not to be displayed */
struct skin_token_list *imglist = data->images; 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; imglist = imglist->next;
} }
#endif #endif
if ((hidden_flags&VP_NEVER_VISIBLE)) /* dont redraw the viewport if its disabled */
{ if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE)
continue; { /* 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); display->scroll_stop(&skin_viewport->vp);
skin_viewport->hidden_flags |= VP_DRAW_WASHIDDEN; skin_viewport->hidden_flags |= VP_DRAW_WASHIDDEN;
continue; continue;
} }
else if (((hidden_flags& else if (((skin_viewport->hidden_flags&
(VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)) (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))
== (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 (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 */ /* 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; flags = line->curr_subline->line_type;
if (vp_refresh_mode == WPS_REFRESH_ALL || (flags & vp_refresh_mode) 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 */ /* get_line tells us if we need to update the line */
update_line = get_line(gwps, subline, &align, update_line = get_line(gwps, subline, &align,
@ -1224,7 +1225,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
} }
#endif #endif
if (update_line && if (update_line && !hidden_vp &&
/* conditionals clear the line which means if the %Vd is put into the default /* conditionals clear the line which means if the %Vd is put into the default
viewport there will be a blank line. viewport there will be a blank line.
To get around this we dont allow any actual drawing to happen in the 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 */ /* 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 #endif
} }

1
apps/gui/skin_engine/wps_internals.h
View file

@ -197,7 +197,6 @@ struct skin_line {
#define VP_DRAW_WASHIDDEN 0x4 #define VP_DRAW_WASHIDDEN 0x4
/* these are never drawn, nor cleared, i.e. just ignored */ /* these are never drawn, nor cleared, i.e. just ignored */
#define VP_NEVER_VISIBLE 0x8 #define VP_NEVER_VISIBLE 0x8
#define VP_NEVER_CLEAR 0x10
#define VP_DEFAULT_LABEL '|' #define VP_DEFAULT_LABEL '|'
#define VP_NO_LABEL '-' #define VP_NO_LABEL '-'
#define VP_INFO_LABEL '_' #define VP_INFO_LABEL '_'

2
apps/gui/statusbar-skinned.c
View file

@ -85,7 +85,7 @@ void sb_skin_data_load(enum screen_type screen, const char *buf, bool isfile)
success = false; success = false;
} }
/* hide this viewport, forever */ /* hide this viewport, forever */
vp->hidden_flags = VP_NEVER_CLEAR; vp->hidden_flags = VP_NEVER_VISIBLE;
} }
if (!success && isfile) if (!success && isfile)