diff options
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_display.c | 26 | ||||
| -rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 1 | ||||
| -rw-r--r-- | apps/gui/statusbar-skinned.c | 2 |
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) |