summaryrefslogtreecommitdiff
path: root/apps/gui/bitmap/list.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/bitmap/list.c')
-rw-r--r--apps/gui/bitmap/list.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index bc7bb876c9..4e3fae804a 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -130,12 +130,12 @@ void list_draw(struct screen *display, struct gui_synclist *list)
130 vp = list_text[screen]; 130 vp = list_text[screen];
131 vp.width = SCROLLBAR_WIDTH; 131 vp.width = SCROLLBAR_WIDTH;
132 list_text[screen].width -= SCROLLBAR_WIDTH; 132 list_text[screen].width -= SCROLLBAR_WIDTH;
133 if(!global_settings.scrollbar_position) /* left */ 133 if(global_settings.scrollbar == SCROLLBAR_LEFT)
134 list_text[screen].x += SCROLLBAR_WIDTH; 134 list_text[screen].x += SCROLLBAR_WIDTH;
135 vp.height = line_height * 135 vp.height = line_height *
136 viewport_get_nb_lines(&list_text[screen]); 136 viewport_get_nb_lines(&list_text[screen]);
137 vp.x = parent->x; 137 vp.x = parent->x;
138 if(global_settings.scrollbar_position) /* right */ 138 if(global_settings.scrollbar == SCROLLBAR_RIGHT) /* right */
139 vp.x += list_text[screen].width; 139 vp.x += list_text[screen].width;
140 display->set_viewport(&vp); 140 display->set_viewport(&vp);
141 gui_scrollbar_draw(display, 0, 0, SCROLLBAR_WIDTH-1, 141 gui_scrollbar_draw(display, 0, 0, SCROLLBAR_WIDTH-1,
@@ -147,7 +147,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
147 else if (show_title) 147 else if (show_title)
148 { 148 {
149 /* shift everything right a bit... */ 149 /* shift everything right a bit... */
150 if(!global_settings.scrollbar_position) /* left */ 150 if(global_settings.scrollbar == SCROLLBAR_LEFT)
151 { 151 {
152 list_text[screen].width -= SCROLLBAR_WIDTH; 152 list_text[screen].width -= SCROLLBAR_WIDTH;
153 list_text[screen].x += SCROLLBAR_WIDTH; 153 list_text[screen].x += SCROLLBAR_WIDTH;
@@ -341,13 +341,13 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
341 return ACTION_NONE; 341 return ACTION_NONE;
342 } 342 }
343 /* Scroll bar */ 343 /* Scroll bar */
344 else if(!global_settings.scrollbar_position) /* left */ 344 else if(global_settings.scrollbar == SCROLLBAR_LEFT)
345 return gui_synclist_touchscreen_scrollbar(gui_list, y); 345 return gui_synclist_touchscreen_scrollbar(gui_list, y);
346 } 346 }
347 else 347 else
348 { 348 {
349 if(x>list_text[screen].x+list_text[screen].width && 349 if(x>list_text[screen].x+list_text[screen].width &&
350 global_settings.scrollbar_position) /* right*/ 350 global_settings.scrollbar == SCROLLBAR_RIGHT)
351 return gui_synclist_touchscreen_scrollbar(gui_list, y); 351 return gui_synclist_touchscreen_scrollbar(gui_list, y);
352 352
353 /* |--------------------------------------------------------| 353 /* |--------------------------------------------------------|