Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3812 → Rev 3811

/programs/fs/opendial/opendial.asm
311,8 → 311,6
push dword file_browser_data_1
call [FileBrowser_key]
 
call draw_open_button_label
 
cmp [file_browser_data_1.draw_scroll_bar],0
je @f
call draw_scrollbar1
762,8 → 760,6
push dword file_browser_data_1
call [FileBrowser_mouse]
 
call draw_open_button_label
 
mov eax,file_browser_data_1.mouse_keys_delta
cmp [eax],dword 3
jne .check_focus ; scrollbar
1372,9 → 1368,7
call draw_for_fs_errors
jmp .1
@@:
mov [do_not_draw_open_button_label],1
call draw_draw_file_browser1
mov [do_not_draw_open_button_label],0
.1:
push dword menu_data_1
call [menu_bar_draw]
1455,7 → 1449,7
shr ecx,16
mov bx,cx
add ebx,6 shl 16+4
add ebx,12 shl 16+4
mov edx,[open_dialog_type]
shl edx,2
1462,13 → 1456,10
add edx,message_open_dialog_button
mov edx,[edx]
mov eax,[file_browser_data_1.selected_BDVK_adress]
test [eax],byte 0x10
jz @f
 
mov edx,message_0 ; Open Dir
cmp [open_dialog_type],2 ; Select dir
jne @f
sub ebx,5 shl 16
@@:
mov [open_button_coordinates],ebx
mov ecx,[w_work_button_text]
or ecx,0x90000000
mcall 4 ;message_open_button
1480,63 → 1471,6
 
ret
;---------------------------------------------------------------------
draw_open_button_label:
cmp [do_not_draw_open_button_label],1
je .exit_1
 
cmp [open_dialog_type],1
jne .exit_1
 
pusha
mov ebx,[open_button_coordinates]
test ebx,ebx
jz .exit
 
mov edx,[open_dialog_type]
shl edx,2
add edx,message_open_dialog_button
mov edx,[edx]
mov eax,[file_browser_data_1.selected_BDVK_adress]
test [eax],byte 0x10
jz @f
mov edx,message_0 ; Open Dir
jmp .1
@@:
call copy_new_file_name
.1:
mov ecx,[w_work_button_text]
or ecx,0xd0000000
mov edi,[w_work_button]
mcall 4 ;message_open_button
.exit:
popa
.exit_1:
ret
;---------------------------------------------------------------------
copy_new_file_name:
mov esi,[file_browser_data_1.selected_BDVK_adress]
add esi,40
mov edi,user_selected_name
cld
@@:
lodsb
stosb
test al,al
jnz @r
sub edi,user_selected_name
dec edi
mov esi,edit1
mov [esi+48],edi ;ed_size
mov [esi+52],edi ;ed_pos
 
push dword name_editboxes
call [edit_box_draw]
ret
;---------------------------------------------------------------------
prepare_system_colors:
mcall 48,3,app_colours,10*4
 
1726,6 → 1660,14
call [PathShow_draw]
ret
;draw_dir_path_1:
; mov ebx,[file_browser_data_1.x]
; mcall 13,,<7,15>,0xffffb0
; mov bx,10
; add ebx,4 shl 16
; mcall 4,,0xC0000000,dir_path,,0xffffb0
; ret
;---------------------------------------------------------------------
draw_draw_file_browser1:
call draw_dir_path
1741,7 → 1683,6
push dword file_browser_data_1
call [FileBrowser_draw]
 
call draw_open_button_label
call prepare_scrollbar_data
 
1761,8 → 1702,6
push dword file_browser_data_1
call [FileBrowser_draw]
 
call draw_open_button_label
 
xor eax,eax
mov [file_browser_data_1.all_redraw],eax
ret
1799,6 → 1738,18
ret
;---------------------------------------------------------------------
get_active_pocess:
; mcall 9,procinfo,-1
; mov eax,[ebx+30]
; mov [PID],eax
; xor ecx,ecx
;@@:
; inc ecx
; mcall 9,procinfo
; mov eax,[PID]
; cmp eax,[ebx+30]
; jne @r
; mov [active_process],ecx
 
mcall 9,procinfo,-1
mov ecx,[ebx+30] ; PID
mcall 18,21
2793,6 → 2744,7
message_2:
db 'Select',0
title_0:
db 'Open Dialog',0
title_1:
3092,8 → 3044,6
;---------------------------------------------------------------------
IM_END:
;---------------------------------------------------------------------
do_not_draw_open_button_label rb 1
;---------------------------------------------------------------------
align 4
app_colours:
 
3108,8 → 3058,6
w_work_text rd 1
w_work_graph rd 1
;---------------------------------------------------------------------
open_button_coordinates rd 1
;---------------------------------------------------------------------
menu_text_area_1_1:
rb 256
;---------------------------------------------------------------------