1) Small fix for FileBrowser control.
2) OpenDialog - fix for Tab key and additional associations for icons.

git-svn-id: svn://kolibrios.org@1248 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2009-11-05 21:31:58 +00:00
parent 1c03f9f1e4
commit 725fe0911e
3 changed files with 38 additions and 6 deletions

View File

@ -176,8 +176,10 @@ key:
je NumPad_invert_Up je NumPad_invert_Up
cmp ah,158 cmp ah,158
je symbol_a_up je symbol_a_up
cmp ah,15 ;143 ; Tab cmp ah,15 ; Tab down
je change_focus_area je change_focus_area_press_Tab_key
cmp ah,143 ; Tab up
je change_focus_area_check_Tab_key
jmp still jmp still
.extended_key: .extended_key:
mov [extended_key],0 mov [extended_key],0
@ -269,6 +271,30 @@ key:
@@: @@:
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
change_focus_area_Tab_key_ASCII:
xor eax,eax
inc eax
mov [Tab_key_block],al
jmp change_focus_area
;---------------------------------------------------------------------
change_focus_area_press_Tab_key:
mov al,[Tab_key_block]
test al,al
jnz still
xor eax,eax
inc eax
mov [Tab_key],al
jmp still
;---------------------------------------------------------------------
change_focus_area_check_Tab_key:
xor eax,eax
mov [Tab_key_block],al
mov al,[Tab_key]
test al,al
jz still
xor eax,eax
mov [Tab_key],al
;---------------------------------------------------------------------
change_focus_area: change_focus_area:
mov al,[focus_pointer] mov al,[focus_pointer]
inc al inc al
@ -295,7 +321,7 @@ change_focus_area:
key_ASCII: key_ASCII:
mcall 2 mcall 2
cmp ah,9 cmp ah,9
je change_focus_area je change_focus_area_Tab_key_ASCII
cmp ah,13 cmp ah,13
je .load_dir je .load_dir
cmp ah,27 cmp ah,27
@ -2306,6 +2332,9 @@ alt_flag db 0
error_window db 0 error_window db 0
Tab_key db 0
Tab_key_block db 0
filter_flag db 1 filter_flag db 1
focus_pointer db 0 focus_pointer db 0

View File

@ -10,6 +10,7 @@ exc=3
wtx=3 wtx=3
inf=3 inf=3
xml=3 xml=3
odt=3
jpg=6 jpg=6
jpe=6 jpe=6
jpeg=6 jpeg=6
@ -88,6 +89,7 @@ flv=11
mkv=11 mkv=11
wmv=11 wmv=11
mov=11 mov=11
mp4=11
img=5 img=5
ima=5 ima=5
imz=5 imz=5
@ -127,6 +129,7 @@ mt=12
htm=13 htm=13
html=13 html=13
mht=13 mht=13
eml=13
lif=14 lif=14
3ds=15 3ds=15
kex=16 kex=16

View File

@ -1014,9 +1014,9 @@ fb_mouse:
mov fb_mouse_keys_delta,edx mov fb_mouse_keys_delta,edx
jmp .exit_fb jmp .exit_fb
.enter_1: .enter_1:
mov eax,fb_mouse_keys_old ; mov eax,fb_mouse_keys_old
cmp fb_mouse_keys,eax ; cmp fb_mouse_keys,eax
jz .exit_fb ; jz .exit_fb
test fb_mouse_keys,10b test fb_mouse_keys,10b
jne .mark_mouse jne .mark_mouse
mov edx,2 mov edx,2