diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/clock/clock_bitmap_strings.c | 2 | ||||
-rw-r--r-- | apps/plugins/clock/clock_draw_binary.c | 4 | ||||
-rw-r--r-- | apps/plugins/clock/clock_draw_digital.c | 4 | ||||
-rw-r--r-- | apps/plugins/clock/clock_settings.c | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/apps/plugins/clock/clock_bitmap_strings.c b/apps/plugins/clock/clock_bitmap_strings.c index 1b527bb7e4..c909dbeb7b 100644 --- a/apps/plugins/clock/clock_bitmap_strings.c +++ b/apps/plugins/clock/clock_bitmap_strings.c | |||
@@ -43,6 +43,6 @@ void draw_string(struct screen* display, const struct picture* bitmaps, | |||
43 | } | 43 | } |
44 | 44 | ||
45 | void getstringsize(const struct picture* bitmaps, char* str, int *w, int *h ){ | 45 | void getstringsize(const struct picture* bitmaps, char* str, int *w, int *h ){ |
46 | *h=bitmaps->height; | 46 | *h=bitmaps->slide_height; |
47 | *w=rb->strlen(str)*bitmaps->width; | 47 | *w=rb->strlen(str)*bitmaps->width; |
48 | } | 48 | } |
diff --git a/apps/plugins/clock/clock_draw_binary.c b/apps/plugins/clock/clock_draw_binary.c index ec1a0fed0f..620788dc5e 100644 --- a/apps/plugins/clock/clock_draw_binary.c +++ b/apps/plugins/clock/clock_draw_binary.c | |||
@@ -45,11 +45,11 @@ void binary_clock_draw(struct screen* display, struct time* time, int skin){ | |||
45 | char buffer[9]; | 45 | char buffer[9]; |
46 | int i; | 46 | int i; |
47 | const struct picture* binary_bitmaps = &(binary_skin[skin][display->screen_type]); | 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 | int x_offset=(display->getwidth()-(binary_bitmaps->width*6))/2; | 49 | int x_offset=(display->getwidth()-(binary_bitmaps->width*6))/2; |
50 | for(i=0;i<3;i++){ | 50 | for(i=0;i<3;i++){ |
51 | print_binary(buffer, lines_values[i], 6); | 51 | print_binary(buffer, lines_values[i], 6); |
52 | draw_string(display, binary_bitmaps, buffer, x_offset, | 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 | } |
diff --git a/apps/plugins/clock/clock_draw_digital.c b/apps/plugins/clock/clock_draw_digital.c index 1a95a6fe45..7218b2c7b8 100644 --- a/apps/plugins/clock/clock_draw_digital.c +++ b/apps/plugins/clock/clock_draw_digital.c | |||
@@ -72,14 +72,14 @@ void digital_clock_draw(struct screen* display, | |||
72 | getstringsize(digits_bitmaps, buffer, &str_w, &str_h); | 72 | getstringsize(digits_bitmaps, buffer, &str_w, &str_h); |
73 | draw_string(display, digits_bitmaps, buffer, | 73 | draw_string(display, digits_bitmaps, buffer, |
74 | (display->getwidth()-str_w)/2, | 74 | (display->getwidth()-str_w)/2, |
75 | digits_bitmaps->height); | 75 | digits_bitmaps->slide_height); |
76 | } | 76 | } |
77 | if(settings->general.date_format!=NONE){ | 77 | if(settings->general.date_format!=NONE){ |
78 | format_date(buffer, time, settings->general.date_format); | 78 | format_date(buffer, time, settings->general.date_format); |
79 | getstringsize(smalldigits_bitmaps, buffer, &str_w, &str_h); | 79 | getstringsize(smalldigits_bitmaps, buffer, &str_w, &str_h); |
80 | draw_string(display, smalldigits_bitmaps, buffer, | 80 | draw_string(display, smalldigits_bitmaps, buffer, |
81 | (display->getwidth()-str_w)/2, | 81 | (display->getwidth()-str_w)/2, |
82 | display->getheight()-smalldigits_bitmaps->height*2); | 82 | display->getheight()-smalldigits_bitmaps->slide_height*2); |
83 | } | 83 | } |
84 | if(counter){ | 84 | if(counter){ |
85 | struct time counter_time; | 85 | struct time counter_time; |
diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c index d765cbb0da..8464ab0ed1 100644 --- a/apps/plugins/clock/clock_settings.c +++ b/apps/plugins/clock/clock_settings.c | |||
@@ -144,11 +144,12 @@ void draw_logo(struct screen* display){ | |||
144 | void draw_message(struct screen* display, int msg, int y){ | 144 | void draw_message(struct screen* display, int msg, int y){ |
145 | const struct picture* message = &(messages[display->screen_type]); | 145 | const struct picture* message = &(messages[display->screen_type]); |
146 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 146 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
147 | display->fillrect(0, display->getheight()-message->height, | 147 | display->fillrect(0, display->getheight()-message->slide_height, |
148 | display->getwidth(), message->height); | 148 | display->getwidth(), message->slide_height); |
149 | display->set_drawmode(DRMODE_SOLID); | 149 | display->set_drawmode(DRMODE_SOLID); |
150 | vertical_picture_draw_sprite(display, message, msg, | 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 | void load_settings(void){ | 155 | void load_settings(void){ |