diff options
Diffstat (limited to 'apps/plugins/text_viewer')
-rw-r--r-- | apps/plugins/text_viewer/tv_action.c | 13 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_menu.c | 1 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_menu.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/apps/plugins/text_viewer/tv_action.c b/apps/plugins/text_viewer/tv_action.c index 1f2ad78666..53a29ef021 100644 --- a/apps/plugins/text_viewer/tv_action.c +++ b/apps/plugins/text_viewer/tv_action.c | |||
@@ -173,11 +173,16 @@ enum tv_menu_result tv_menu(void) | |||
173 | 173 | ||
174 | res = tv_display_menu(); | 174 | res = tv_display_menu(); |
175 | 175 | ||
176 | tv_convert_fpos(cur_file_pos, &cur_pos); | 176 | if (res == TV_MENU_RESULT_EXIT_MENU) |
177 | if (prefs->vertical_scroll_mode == PAGE) | 177 | { |
178 | cur_pos.line = 0; | 178 | tv_convert_fpos(cur_file_pos, &cur_pos); |
179 | if (prefs->vertical_scroll_mode == PAGE) | ||
180 | cur_pos.line = 0; | ||
179 | 181 | ||
180 | tv_move_screen(cur_pos.page, cur_pos.line, SEEK_SET); | 182 | tv_move_screen(cur_pos.page, cur_pos.line, SEEK_SET); |
183 | } | ||
184 | else if (res == TV_MENU_RESULT_MOVE_PAGE) | ||
185 | res = TV_MENU_RESULT_EXIT_MENU; | ||
181 | 186 | ||
182 | return res; | 187 | return res; |
183 | } | 188 | } |
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c index c40d6e67a6..f94022f3e3 100644 --- a/apps/plugins/text_viewer/tv_menu.c +++ b/apps/plugins/text_viewer/tv_menu.c | |||
@@ -375,6 +375,7 @@ enum tv_menu_result tv_display_menu(void) | |||
375 | break; | 375 | break; |
376 | case 3: /* select bookmark */ | 376 | case 3: /* select bookmark */ |
377 | tv_select_bookmark(); | 377 | tv_select_bookmark(); |
378 | result = TV_MENU_RESULT_MOVE_PAGE; | ||
378 | break; | 379 | break; |
379 | case 4: /* change global settings */ | 380 | case 4: /* change global settings */ |
380 | if (!tv_load_global_settings(&new_prefs)) | 381 | if (!tv_load_global_settings(&new_prefs)) |
diff --git a/apps/plugins/text_viewer/tv_menu.h b/apps/plugins/text_viewer/tv_menu.h index 35886d3c10..9f28723b87 100644 --- a/apps/plugins/text_viewer/tv_menu.h +++ b/apps/plugins/text_viewer/tv_menu.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #define PLUGIN_TEXT_VIEWER_MENU_H | 24 | #define PLUGIN_TEXT_VIEWER_MENU_H |
25 | 25 | ||
26 | enum tv_menu_result { | 26 | enum tv_menu_result { |
27 | TV_MENU_RESULT_MOVE_PAGE, | ||
27 | TV_MENU_RESULT_EXIT_MENU, | 28 | TV_MENU_RESULT_EXIT_MENU, |
28 | TV_MENU_RESULT_EXIT_PLUGIN, | 29 | TV_MENU_RESULT_EXIT_PLUGIN, |
29 | TV_MENU_RESULT_ATTACHED_USB, | 30 | TV_MENU_RESULT_ATTACHED_USB, |
@@ -34,6 +35,7 @@ enum tv_menu_result { | |||
34 | * | 35 | * |
35 | * return | 36 | * return |
36 | * the following value returns | 37 | * the following value returns |
38 | * TV_MENU_RESULT_MOVE_PAGE change reading page | ||
37 | * TV_MENU_RESULT_EXIT_MENU menu exit and continue this plugin | 39 | * TV_MENU_RESULT_EXIT_MENU menu exit and continue this plugin |
38 | * TV_MENU_RESULT_EXIT_PLUGIN request to exit this plugin | 40 | * TV_MENU_RESULT_EXIT_PLUGIN request to exit this plugin |
39 | * TV_MENU_RESULT_ATTACHED_USB connect USB cable | 41 | * TV_MENU_RESULT_ATTACHED_USB connect USB cable |