From 8b98e71db35601d0b62122929e57e9080e57f913 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 12 Jul 2013 07:08:39 +0000 Subject: [PATCH] Box_Lib - return with actual fb_selected_BDVK_adress after any call of FileBrowser git-svn-id: svn://kolibrios.org@3811 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../libraries/box_lib/trunk/filebrowser.mac | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/programs/develop/libraries/box_lib/trunk/filebrowser.mac b/programs/develop/libraries/box_lib/trunk/filebrowser.mac index 0028034f36..3de05a565b 100644 --- a/programs/develop/libraries/box_lib/trunk/filebrowser.mac +++ b/programs/develop/libraries/box_lib/trunk/filebrowser.mac @@ -103,6 +103,7 @@ fb_draw_panel: call fb_calc_folder_sysdata call fb_draw_panel_selection call fb_draw_folder_data + call fb_prepare_selected_BDVK_adress file_browser_exit ;--------------------------------------------------------------------- fb_draw_panel_1: @@ -1076,6 +1077,7 @@ fb_mouse: mov fb_mouse_keys_delta,eax ;------------------------------------------------------- .exit_fb: + call fb_prepare_selected_BDVK_adress file_browser_exit ;------------------------------------------------------- .mark_mouse: @@ -1092,17 +1094,6 @@ file_browser_exit mov eax,3 mov fb_mouse_keys_delta,eax xor eax,eax - mov ax,fb_start_draw_cursor_line - xor ebx,ebx - mov bx,fb_line_size_y - xor edx,edx - div ebx - add eax,fb_start_draw_line - imul eax,304 - add eax,32 - add eax,fb_folder_data - mov fb_selected_BDVK_adress,eax - xor eax,eax mov fb_max_name_temp_size,eax ret ;------------------------------------------------------- @@ -1116,6 +1107,21 @@ file_browser_exit ret ;***************************************************************************** ;***************************************************************************** +fb_prepare_selected_BDVK_adress: + xor eax,eax + mov ax,fb_start_draw_cursor_line + xor ebx,ebx + mov bx,fb_line_size_y + xor edx,edx + div ebx + add eax,fb_start_draw_line + imul eax,304 + add eax,32 + add eax,fb_folder_data + mov fb_selected_BDVK_adress,eax + ret +;***************************************************************************** +;***************************************************************************** ; key event ; 1 - arrow down ; 2 - arrow up @@ -1391,6 +1397,7 @@ fb_key: jmp .mark_all_1 ;------------------------------------------------------- .exit_fb: + call fb_prepare_selected_BDVK_adress file_browser_exit ;------------------------------------------------------- fb_key_table: