summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/bitmap/list.c6
-rw-r--r--apps/gui/icon.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 79eec60b26..b1fd474571 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -124,7 +124,7 @@ static bool draw_title(struct screen *display, struct gui_synclist *list)
124 title_text_vp->width -= title_icon.width; 124 title_text_vp->width -= title_icon.width;
125 125
126 display->set_viewport(&title_icon); 126 display->set_viewport(&title_icon);
127 screen_put_iconxy(display, 0, 0, list->title_icon); 127 screen_put_iconxy(display, ICON_PADDING, 0, list->title_icon);
128 } 128 }
129#ifdef HAVE_LCD_COLOR 129#ifdef HAVE_LCD_COLOR
130 if (list->title_color >= 0) 130 if (list->title_color >= 0)
@@ -368,7 +368,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
368 display->set_viewport(&list_icons); 368 display->set_viewport(&list_icons);
369 if (list->callback_get_item_icon != NULL) 369 if (list->callback_get_item_icon != NULL)
370 { 370 {
371 int xoff = show_cursor ? list_icon_width(screen) : 0; 371 int xoff = show_cursor ? list_icon_width(screen) : ICON_PADDING;
372 screen_put_iconxy(display, xoff, 372 screen_put_iconxy(display, xoff,
373 line*line_height + draw_offset + icon_yoffset, 373 line*line_height + draw_offset + icon_yoffset,
374 list->callback_get_item_icon(i, list->data)); 374 list->callback_get_item_icon(i, list->data));
@@ -377,7 +377,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
377 if (show_cursor && i >= list->selected_item && 377 if (show_cursor && i >= list->selected_item &&
378 i < list->selected_item + list->selected_size) 378 i < list->selected_item + list->selected_size)
379 { 379 {
380 screen_put_iconxy(display, 0, 380 screen_put_iconxy(display, ICON_PADDING,
381 line*line_height + draw_offset + icon_yoffset, 381 line*line_height + draw_offset + icon_yoffset,
382 Icon_Cursor); 382 Icon_Cursor);
383 } 383 }
diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index f37cee969c..e943338af5 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -134,9 +134,6 @@ void screen_put_iconxy(struct screen * display,
134 { 134 {
135 iconset = inbuilt_iconset[screen]; 135 iconset = inbuilt_iconset[screen];
136 } 136 }
137 /* add some left padding to the icons if they are on the edge */
138 if (xpos == 0)
139 xpos++;
140 137
141 if (is_rtl) 138 if (is_rtl)
142 xpos = display->getwidth() - xpos - width; 139 xpos = display->getwidth() - xpos - width;