diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/icon.c | 7 | ||||
-rw-r--r-- | apps/gui/scrollbar.c | 6 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 74af4a0d90..53cfd87774 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -144,19 +144,20 @@ void screen_put_iconxy(struct screen * display, | |||
144 | return; | 144 | return; |
145 | } | 145 | } |
146 | data = viewer_iconset[screen].data; | 146 | data = viewer_iconset[screen].data; |
147 | stride = STRIDE( viewer_iconset[screen].width, | 147 | stride = STRIDE( display->screen_type, viewer_iconset[screen].width, |
148 | viewer_iconset[screen].height); | 148 | viewer_iconset[screen].height); |
149 | } | 149 | } |
150 | else if (custom_icons_loaded[screen]) | 150 | else if (custom_icons_loaded[screen]) |
151 | { | 151 | { |
152 | data = user_iconset[screen].data; | 152 | data = user_iconset[screen].data; |
153 | stride = STRIDE( user_iconset[screen].width, | 153 | stride = STRIDE( display->screen_type, user_iconset[screen].width, |
154 | user_iconset[screen].height); | 154 | user_iconset[screen].height); |
155 | } | 155 | } |
156 | else | 156 | else |
157 | { | 157 | { |
158 | data = inbuilt_icons[screen]; | 158 | data = inbuilt_icons[screen]; |
159 | stride = STRIDE(BMPWIDTH_default_icons, BMPHEIGHT_default_icons); | 159 | stride = STRIDE( display->screen_type, BMPWIDTH_default_icons, |
160 | BMPHEIGHT_default_icons); | ||
160 | } | 161 | } |
161 | /* add some left padding to the icons if they are on the edge */ | 162 | /* add some left padding to the icons if they are on the edge */ |
162 | if (xpos == 0) | 163 | if (xpos == 0) |
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c index 193bb4b65a..2e807002f0 100644 --- a/apps/gui/scrollbar.c +++ b/apps/gui/scrollbar.c | |||
@@ -202,7 +202,8 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, int x, | |||
202 | #if LCD_DEPTH > 1 | 202 | #if LCD_DEPTH > 1 |
203 | else | 203 | else |
204 | screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0, | 204 | screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0, |
205 | STRIDE(bm.width, bm.height), | 205 | STRIDE(screen->screen_type, |
206 | bm.width, bm.height), | ||
206 | x + start, y, size, height); | 207 | x + start, y, size, height); |
207 | #endif | 208 | #endif |
208 | } else { | 209 | } else { |
@@ -214,7 +215,8 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap bm, int x, | |||
214 | #if LCD_DEPTH > 1 | 215 | #if LCD_DEPTH > 1 |
215 | else | 216 | else |
216 | screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0, | 217 | screen->transparent_bitmap_part((fb_data *)bm.data, 0, 0, |
217 | STRIDE(bm.width, bm.height), | 218 | STRIDE(screen->screen_type, |
219 | bm.width, bm.height), | ||
218 | x, y + start, width, size); | 220 | x, y + start, width, size); |
219 | #endif | 221 | #endif |
220 | } | 222 | } |
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 0a43a19b90..01f8b13acb 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -232,7 +232,8 @@ static void wps_draw_image(struct gui_wps *gwps, struct gui_img *img, int subima | |||
232 | } else { | 232 | } else { |
233 | display->transparent_bitmap_part((fb_data *)img->bm.data, | 233 | display->transparent_bitmap_part((fb_data *)img->bm.data, |
234 | 0, img->subimage_height * subimage, | 234 | 0, img->subimage_height * subimage, |
235 | STRIDE(img->bm.width, img->bm.height), | 235 | STRIDE(display->screen_type, |
236 | img->bm.width, img->bm.height), | ||
236 | img->x, img->y, img->bm.width, | 237 | img->x, img->y, img->bm.width, |
237 | img->subimage_height); | 238 | img->subimage_height); |
238 | } | 239 | } |