summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/viewer.c2
-rw-r--r--apps/settings_list.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index 948d6af8c1..f2a3f9f029 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -37,6 +37,8 @@ PLUGIN_HEADER
37#define TOP_SECTOR buffer 37#define TOP_SECTOR buffer
38#define MID_SECTOR (buffer + SMALL_BLOCK_SIZE) 38#define MID_SECTOR (buffer + SMALL_BLOCK_SIZE)
39#define BOTTOM_SECTOR (buffer + 2*(SMALL_BLOCK_SIZE)) 39#define BOTTOM_SECTOR (buffer + 2*(SMALL_BLOCK_SIZE))
40#undef SCROLLBAR_WIDTH
41#define SCROLLBAR_WIDTH rb->global_settings->scrollbar_width
40 42
41#define MAX_BOOKMARKED_FILES ((buffer_size/(signed)sizeof(struct bookmarked_file_info))-1) 43#define MAX_BOOKMARKED_FILES ((buffer_size/(signed)sizeof(struct bookmarked_file_info))-1)
42 44
diff --git a/apps/settings_list.c b/apps/settings_list.c
index ef496d5c53..ffea57d355 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -604,7 +604,9 @@ const struct settings_list settings[] = {
604 gui_statusbar_changed, 3, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), 604 gui_statusbar_changed, 3, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP),
605 ID2P(LANG_STATUSBAR_BOTTOM)), 605 ID2P(LANG_STATUSBAR_BOTTOM)),
606#endif 606#endif
607 OFFON_SETTING(0,scrollbar, LANG_SCROLL_BAR, true,"scrollbar", NULL), 607 OFFON_SETTING(0,scrollbar, LANG_SCROLL_BAR, true, "scrollbar", NULL),
608 INT_SETTING(0, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, "scrollbar width",
609 UNIT_INT, 3, LCD_WIDTH/10, 1, NULL, NULL, NULL),
608#if CONFIG_KEYPAD == RECORDER_PAD 610#if CONFIG_KEYPAD == RECORDER_PAD
609 OFFON_SETTING(0,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), 611 OFFON_SETTING(0,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL),
610#endif 612#endif
@@ -1550,9 +1552,6 @@ const struct settings_list settings[] = {
1550 VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"), 1552 VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"),
1551#endif 1553#endif
1552#endif 1554#endif
1553
1554 INT_SETTING(0, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, "scrollbar width",
1555 UNIT_INT, 6, 20, 1, NULL, NULL, NULL),
1556}; 1555};
1557 1556
1558const int nb_settings = sizeof(settings)/sizeof(*settings); 1557const int nb_settings = sizeof(settings)/sizeof(*settings);