diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_display.c')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 537468077c..0a43a19b90 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -506,7 +506,7 @@ struct skin_viewport* find_viewport(char label, struct wps_data *data) | |||
506 | The return value indicates whether the line needs to be updated. | 506 | The return value indicates whether the line needs to be updated. |
507 | */ | 507 | */ |
508 | static bool get_line(struct gui_wps *gwps, | 508 | static bool get_line(struct gui_wps *gwps, |
509 | struct wps_subline *subline, | 509 | struct skin_subline *subline, |
510 | struct align_pos *align, | 510 | struct align_pos *align, |
511 | char *linebuf, | 511 | char *linebuf, |
512 | int linebuf_size) | 512 | int linebuf_size) |
@@ -648,7 +648,7 @@ static bool get_line(struct gui_wps *gwps, | |||
648 | 648 | ||
649 | return update; | 649 | return update; |
650 | } | 650 | } |
651 | static void get_subline_timeout(struct gui_wps *gwps, struct wps_subline *subline) | 651 | static void get_subline_timeout(struct gui_wps *gwps, struct skin_subline *subline) |
652 | { | 652 | { |
653 | struct wps_data *data = gwps->data; | 653 | struct wps_data *data = gwps->data; |
654 | int i; | 654 | int i; |
@@ -682,7 +682,7 @@ static void get_subline_timeout(struct gui_wps *gwps, struct wps_subline *sublin | |||
682 | 682 | ||
683 | /* Calculates which subline should be displayed for the specified line | 683 | /* Calculates which subline should be displayed for the specified line |
684 | Returns true iff the subline must be refreshed */ | 684 | Returns true iff the subline must be refreshed */ |
685 | static bool update_curr_subline(struct gui_wps *gwps, struct wps_line *line) | 685 | static bool update_curr_subline(struct gui_wps *gwps, struct skin_line *line) |
686 | { | 686 | { |
687 | /* shortcut this whole thing if we need to reset the line completly */ | 687 | /* shortcut this whole thing if we need to reset the line completly */ |
688 | if (line->curr_subline == NULL) | 688 | if (line->curr_subline == NULL) |
@@ -920,7 +920,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode) | |||
920 | /* reset to first subline if refresh all flag is set */ | 920 | /* reset to first subline if refresh all flag is set */ |
921 | if (refresh_mode == WPS_REFRESH_ALL) | 921 | if (refresh_mode == WPS_REFRESH_ALL) |
922 | { | 922 | { |
923 | struct wps_line *line; | 923 | struct skin_line *line; |
924 | 924 | ||
925 | display->set_viewport(&find_viewport(VP_DEFAULT_LABEL, data)->vp); | 925 | display->set_viewport(&find_viewport(VP_DEFAULT_LABEL, data)->vp); |
926 | display->clear_viewport(); | 926 | display->clear_viewport(); |
@@ -1000,12 +1000,12 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode) | |||
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | /* loop over the lines for this viewport */ | 1002 | /* loop over the lines for this viewport */ |
1003 | struct wps_line *line; | 1003 | struct skin_line *line; |
1004 | int line_count = 0; | 1004 | int line_count = 0; |
1005 | 1005 | ||
1006 | for (line = skin_viewport->lines; line; line = line->next, line_count++) | 1006 | for (line = skin_viewport->lines; line; line = line->next, line_count++) |
1007 | { | 1007 | { |
1008 | struct wps_subline *subline; | 1008 | struct skin_subline *subline; |
1009 | memset(linebuf, 0, sizeof(linebuf)); | 1009 | memset(linebuf, 0, sizeof(linebuf)); |
1010 | update_line = false; | 1010 | update_line = false; |
1011 | 1011 | ||