tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

skin engine: Remove progressbar viewport field

Again, we don't need to store the viewport in the progressbar
struct because it's known at render time.

Change-Id: I12514ceaace7c897194b18929364340871ef4635

Aidan MacDonald 9368844a f242b0ec

+6 -6
+3 -2
apps/gui/skin_engine/skin_display.c
··· 158 158 159 159 #endif 160 160 161 - void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb) 161 + void draw_progressbar(struct gui_wps *gwps, struct skin_viewport* skin_viewport, 162 + int line, struct progressbar *pb) 162 163 { 163 164 struct screen *display = gwps->display; 164 - struct viewport *vp = SKINOFFSETTOPTR(get_skin_buffer(gwps->data), pb->vp); 165 + struct viewport *vp = &skin_viewport->vp; 165 166 struct wps_state *state = get_wps_state(); 166 167 struct mp3entry *id3 = state->id3; 167 168 int x = pb->x, y = pb->y, width = pb->width, height = pb->height;
+2 -1
apps/gui/skin_engine/skin_display.h
··· 29 29 #define _SKIN_DISPLAY_H_ 30 30 31 31 32 - void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb); 32 + void draw_progressbar(struct gui_wps *gwps, struct skin_viewport* skin_viewport, 33 + int line, struct progressbar *pb); 33 34 void draw_playlist_viewer_list(struct gui_wps *gwps, struct playlistviewer *viewer); 34 35 /* clears the area where the image was shown */ 35 36 void clear_image_pos(struct gui_wps *gwps, struct gui_img *img);
-1
apps/gui/skin_engine/skin_parser.c
··· 966 966 967 967 if (!pb) 968 968 return WPS_ERROR_INVALID_PARAM; 969 - pb->vp = PTRTOSKINOFFSET(skin_buffer, vp); 970 969 pb->follow_lang_direction = follow_lang_direction > 0; 971 970 pb->nofill = false; 972 971 pb->noborder = false;
+1 -1
apps/gui/skin_engine/skin_render.c
··· 241 241 { 242 242 struct progressbar *bar = (struct progressbar*)SKINOFFSETTOPTR(skin_buffer, token->value.data); 243 243 if (do_refresh) 244 - draw_progressbar(gwps, info->line_number, bar); 244 + draw_progressbar(gwps, info->skin_vp, info->line_number, bar); 245 245 } 246 246 break; 247 247 case SKIN_TOKEN_IMAGE_DISPLAY:
-1
apps/gui/skin_engine/wps_internals.h
··· 112 112 113 113 struct progressbar { 114 114 enum skin_token_type type; 115 - OFFSETTYPE(struct viewport *) vp; 116 115 /* regular pb */ 117 116 short x; 118 117 /* >=0: explicitly set in the tag -> y-coord within the viewport