summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/bitmap/list.c4
-rw-r--r--apps/gui/charcell/list.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 4323bb0350..ec12ee5367 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -331,7 +331,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
331 } 331 }
332 /* do the icon */ 332 /* do the icon */
333 display->set_viewport(&list_icons); 333 display->set_viewport(&list_icons);
334 if (list->callback_get_item_icon && global_settings.show_icons) 334 if (list->callback_get_item_icon != NULL)
335 { 335 {
336 screen_put_icon_with_offset(display, show_cursor?1:0, 336 screen_put_icon_with_offset(display, show_cursor?1:0,
337 (line),show_cursor?ICON_PADDING:0,draw_offset, 337 (line),show_cursor?ICON_PADDING:0,draw_offset,
@@ -468,7 +468,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
468 return ACTION_NONE; 468 return ACTION_NONE;
469 469
470 /* x and y are relative to info_vp */ 470 /* x and y are relative to info_vp */
471 if (global_settings.show_icons) 471 if (gui_list->callback_get_item_icon != NULL)
472 icon_width += get_icon_width(screen); 472 icon_width += get_icon_width(screen);
473 if (show_cursor) 473 if (show_cursor)
474 icon_width += get_icon_width(screen); 474 icon_width += get_icon_width(screen);
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c
index 8eebfe7fa1..a0ab02841f 100644
--- a/apps/gui/charcell/list.c
+++ b/apps/gui/charcell/list.c
@@ -51,8 +51,7 @@ void gui_synclist_scroll_stop(struct gui_synclist *lists)
51void list_draw(struct screen *display, struct gui_synclist *gui_list) 51void list_draw(struct screen *display, struct gui_synclist *gui_list)
52{ 52{
53 int text_pos; 53 int text_pos;
54 bool draw_icons = (gui_list->callback_get_item_icon != NULL && 54 bool draw_icons = (gui_list->callback_get_item_icon != NULL);
55 global_settings.show_icons);
56 bool draw_cursor; 55 bool draw_cursor;
57 int i; 56 int i;
58 int lines; 57 int lines;