Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: apps/gui/statusbar-skinned.c
- ===================================================================
- --- apps/gui/statusbar-skinned.c (revision 25266)
- +++ apps/gui/statusbar-skinned.c (working copy)
- @@ -85,7 +85,7 @@
- success = false;
- }
- /* hide this viewport, forever */
- - vp->hidden_flags = VP_NEVER_VISIBLE;
- + vp->hidden_flags = VP_NEVER_CLEAR;
- }
- if (!success && isfile)
- Index: apps/gui/skin_engine/skin_display.c
- ===================================================================
- --- apps/gui/skin_engine/skin_display.c (revision 25266)
- +++ apps/gui/skin_engine/skin_display.c (working copy)
- @@ -1123,11 +1123,10 @@
- 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;
- @@ -1138,19 +1137,18 @@
- imglist = imglist->next;
- }
- #endif
- - /* 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_NEVER_VISIBLE))
- + {
- + continue;
- }
- - else if ((skin_viewport->hidden_flags&VP_DRAW_HIDDEN))
- + if ((hidden_flags&VP_DRAW_HIDDEN))
- {
- - if (!(skin_viewport->hidden_flags&VP_DRAW_WASHIDDEN))
- + if (!(hidden_flags&VP_DRAW_WASHIDDEN))
- display->scroll_stop(&skin_viewport->vp);
- skin_viewport->hidden_flags |= VP_DRAW_WASHIDDEN;
- continue;
- }
- - else if (((skin_viewport->hidden_flags&
- + else if (((hidden_flags&
- (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))
- == (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)))
- {
- @@ -1160,7 +1158,8 @@
- if (vp_refresh_mode == WPS_REFRESH_ALL)
- {
- - display->clear_viewport();
- + if (!(hidden_flags&VP_NEVER_CLEAR))
- + display->clear_viewport();
- }
- /* loop over the lines for this viewport */
- @@ -1179,7 +1178,7 @@
- flags = line->curr_subline->line_type;
- if (vp_refresh_mode == WPS_REFRESH_ALL || (flags & vp_refresh_mode)
- - || new_subline_refresh || hidden_vp)
- + || new_subline_refresh)
- {
- /* get_line tells us if we need to update the line */
- update_line = get_line(gwps, subline, &align,
- @@ -1225,7 +1224,7 @@
- }
- #endif
- - if (update_line && !hidden_vp &&
- + if (update_line &&
- /* 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
- @@ -1254,8 +1253,7 @@
- }
- }
- /* Now display any images in this viewport */
- - if (!hidden_vp)
- - wps_display_images(gwps, &skin_viewport->vp);
- + wps_display_images(gwps, &skin_viewport->vp);
- #endif
- }
- Index: apps/gui/skin_engine/wps_internals.h
- ===================================================================
- --- apps/gui/skin_engine/wps_internals.h (revision 25266)
- +++ apps/gui/skin_engine/wps_internals.h (working copy)
- @@ -197,6 +197,7 @@
- #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 '_'
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement