A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

Clock: Fix rendering.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22617 a1c6a512-1295-4272-9138-f99709370657

+9 -8
+1 -1
apps/plugins/clock/clock_bitmap_strings.c
··· 43 43 } 44 44 45 45 void getstringsize(const struct picture* bitmaps, char* str, int *w, int *h ){ 46 - *h=bitmaps->height; 46 + *h=bitmaps->slide_height; 47 47 *w=rb->strlen(str)*bitmaps->width; 48 48 }
+2 -2
apps/plugins/clock/clock_draw_binary.c
··· 45 45 char buffer[9]; 46 46 int i; 47 47 const struct picture* binary_bitmaps = &(binary_skin[skin][display->screen_type]); 48 - int y_offset=(display->getheight()-(binary_bitmaps->height*3))/2; 48 + int y_offset=(display->getheight()-(binary_bitmaps->slide_height*3))/2; 49 49 int x_offset=(display->getwidth()-(binary_bitmaps->width*6))/2; 50 50 for(i=0;i<3;i++){ 51 51 print_binary(buffer, lines_values[i], 6); 52 52 draw_string(display, binary_bitmaps, buffer, x_offset, 53 - binary_bitmaps->height*i+y_offset); 53 + binary_bitmaps->slide_height*i+y_offset); 54 54 } 55 55 }
+2 -2
apps/plugins/clock/clock_draw_digital.c
··· 72 72 getstringsize(digits_bitmaps, buffer, &str_w, &str_h); 73 73 draw_string(display, digits_bitmaps, buffer, 74 74 (display->getwidth()-str_w)/2, 75 - digits_bitmaps->height); 75 + digits_bitmaps->slide_height); 76 76 } 77 77 if(settings->general.date_format!=NONE){ 78 78 format_date(buffer, time, settings->general.date_format); 79 79 getstringsize(smalldigits_bitmaps, buffer, &str_w, &str_h); 80 80 draw_string(display, smalldigits_bitmaps, buffer, 81 81 (display->getwidth()-str_w)/2, 82 - display->getheight()-smalldigits_bitmaps->height*2); 82 + display->getheight()-smalldigits_bitmaps->slide_height*2); 83 83 } 84 84 if(counter){ 85 85 struct time counter_time;
+4 -3
apps/plugins/clock/clock_settings.c
··· 144 144 void draw_message(struct screen* display, int msg, int y){ 145 145 const struct picture* message = &(messages[display->screen_type]); 146 146 display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); 147 - display->fillrect(0, display->getheight()-message->height, 148 - display->getwidth(), message->height); 147 + display->fillrect(0, display->getheight()-message->slide_height, 148 + display->getwidth(), message->slide_height); 149 149 display->set_drawmode(DRMODE_SOLID); 150 150 vertical_picture_draw_sprite(display, message, msg, 151 - 0, display->getheight()-(message->height*y)); 151 + 0, display->getheight() - 152 + (message->slide_height*y)); 152 153 } 153 154 154 155 void load_settings(void){