diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-08-18 22:42:37 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-08-18 22:42:37 +0000 |
commit | ae901c2e5040e70fefc053a9a4c2379f917173ce (patch) | |
tree | 7019804aeb18fdaa2634ad51e443c948d443aeec /apps | |
parent | bbae89c12e738cd5014385a6331610e7dbf292e9 (diff) | |
download | rockbox-ae901c2e5040e70fefc053a9a4c2379f917173ce.tar.gz rockbox-ae901c2e5040e70fefc053a9a4c2379f917173ce.zip |
Scrollbar position: only update it when exiting the menu + FS#10539 by Alexander Levin (change the order of Left/Right)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22414 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/bitmap/list.c | 10 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index 578c9ced72..bc7bb876c9 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_position) /* 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_position) /* 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_position) /* 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_position) /* 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_position) /* right*/ |
351 | return gui_synclist_touchscreen_scrollbar(gui_list, y); | 351 | return gui_synclist_touchscreen_scrollbar(gui_list, y); |
352 | 352 | ||
353 | /* |--------------------------------------------------------| | 353 | /* |--------------------------------------------------------| |
diff --git a/apps/settings.h b/apps/settings.h index c33b715b95..2f2086ff7e 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -769,7 +769,7 @@ struct user_settings | |||
769 | unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */ | 769 | unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */ |
770 | #endif | 770 | #endif |
771 | int scrollbar_width; | 771 | int scrollbar_width; |
772 | bool scrollbar_position; /* true=left false=right */ | 772 | bool scrollbar_position; /* false=left true=right */ |
773 | #endif | 773 | #endif |
774 | 774 | ||
775 | #if CONFIG_CODEC == SWCODEC | 775 | #if CONFIG_CODEC == SWCODEC |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 73c39bfa50..3d3b888c2d 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -608,8 +608,8 @@ const struct settings_list settings[] = { | |||
608 | OFFON_SETTING(0,scrollbar, LANG_SCROLL_BAR, true, "scrollbar", NULL), | 608 | OFFON_SETTING(0,scrollbar, LANG_SCROLL_BAR, true, "scrollbar", NULL), |
609 | INT_SETTING(0, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, "scrollbar width", | 609 | INT_SETTING(0, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, "scrollbar width", |
610 | UNIT_INT, 3, LCD_WIDTH/10, 1, NULL, NULL, NULL), | 610 | UNIT_INT, 3, LCD_WIDTH/10, 1, NULL, NULL, NULL), |
611 | BOOL_SETTING(0, scrollbar_position, LANG_SCROLLBAR_POSITION, true, | 611 | BOOL_SETTING(F_TEMPVAR, scrollbar_position, LANG_SCROLLBAR_POSITION, false, |
612 | "scrollbar pos", "left,right", LANG_LEFT, LANG_RIGHT, NULL), | 612 | "scrollbar pos", "left,right", LANG_RIGHT, LANG_LEFT, NULL), |
613 | #if CONFIG_KEYPAD == RECORDER_PAD | 613 | #if CONFIG_KEYPAD == RECORDER_PAD |
614 | OFFON_SETTING(0,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), | 614 | OFFON_SETTING(0,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), |
615 | #endif | 615 | #endif |