Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

KFM: appearance fix

Browse Source 
git-svn-id: svn://kolibrios.org@5887 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pathoswithin 2015-11-06 16:17:27 +00:00
parent c024ca0535
commit 8b4cd9218d
3 changed files with 14 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/fs/kfm/trunk/draw.inc
View File

@ -156,8 +156,9 @@ calclulate_sort_button_2:
shl edx,2
add edx,sort_button_name
mov eax,4
xor ecx,ecx
mov esi,eax
mcall ,,0x10000000
mcall
popa
dec edx
sub ebx,38 shl 16
@ -1045,7 +1046,7 @@ draw_fbutton:
draw_fbutton_name:
mov ebx, 7 shl 16
add ebx,[window_high]
sub ebx,15
sub ebx,19
mov eax,4
mov ecx,0x90000000
push ebx

3
programs/fs/kfm/trunk/drw_dbut.inc
View File

@ -6,7 +6,6 @@ draw_device_button:
mov bx,[left_panel_x.start_x]
mov cx,[left_panel_y.start_y]
shl ebx,16
; mov bx,50 ; button size X
sub cx,30
shl ecx,16
mov cx,12
@ -45,7 +44,7 @@ draw_device_button:
inc edx
shr ecx,16
mov bx,cx
add ebx,4 shl 16 +3
add ebx,4 shl 16
mcall 4,,0x90000000
sub ebx,1 shl 16 + 1
mcall ,,0x90ffffff

85
programs/fs/kfm/trunk/kfm.asm
View File

@ -60,17 +60,6 @@ include 'files.inc'
STRLEN = 1024
;---------------------------------------------------------------------
START:
; 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
@ -86,8 +75,6 @@ START:
call device_detect_f70
call select_starting_directories
mcall 66, 1, 1
; call draw_window
; xor eax,eax
mov eax,1
mov [left_sort_flag],eax
mov [right_sort_flag],eax
@ -192,14 +179,12 @@ get_window_param:
;---------------------------------------------------------------------
draw_window:
mcall 12, 1
; mcall 0, <20,620>, <20,460>, 0x03cccccc ; 0x805080D0, 0x005080D0
xor esi,esi
mcall 0, <20,620>, <20,460>, 0x43cccccc ; 0x805080D0, 0x005080D0
mcall 0, <20,728>, <20,460>, 0x43cccccc ; 0x805080D0, 0x005080D0
call get_window_param
mcall 71, 1, header_text
; mov ecx,[temp_esi]
test [window_status],100b ; window is rolled up
jnz .exit
@ -223,17 +208,8 @@ draw_window:
cmp [window_width],495
jb .exit
; pusha
; mcall 4,<15,25>,0,read_folder.name,100
; popa
call draw_fbutton
; mov [left_panel_clear_all],1
call draw_left_panel
; mov [right_panel_clear_all],1
call draw_right_panel
call draw_device_button
call draw_left_select_disk_button
@ -242,65 +218,9 @@ draw_window:
call draw_right_sort_button
call draw_menu_bar
call draw_buttons_panel
; call draw_ATAPI_tray_control
; mcall 47,0x80000,[left_scroll_compens],<300, 5>,0xffffff
; call mouse.draw_data
; mcall 18, 7
; mov [temp_eax],eax
; mcall 47,0x80000,[active_process],<300, 5>,0xffffff
; mcall 47,0x80000,[left_marked_counter],<300, 5>,0xffffff
; mcall 47,0x80000,[right_marked_counter],<400, 5>,0xffffff
; mcall 47,0x80000,[sorting_low_limit],<100, 5>,0xffffff
; mcall 47,0x80000,[sort_counter],<200, 5>,0xffffff
; mcall 47,0x80000,[sorting_high_limit],<300, 5>,0xffffff
; mcall 47,0x80000,[dir_temp_counter],<400, 5>,0xffffff
; mcall 47,0x80000,[timer_tick],<500, 5>,0xffffff
; mcall 47,0x80000,[temp_eax],<400, 5>,0xffffff
; mcall 47,0x80000,[temp_ebx],<400, 5>,0xffffff
; mcall 47,0x80000,[temp_ecx],<500, 5>,0xffffff
; mcall 47,0x80000,[temp_ebx],<500, 5>,0xffffff
; mcall 47,0x80000,[ini_file_start],<100, 5>,0xffffff
; mcall 47,0x80000,[left_folder_data],<200, 5>,0xffffff
; mcall 47,0x80000,[right_folder_data],<300, 5>,0xffffff
; mcall 47,0x80000,[appl_memory],<500, 5>,0xffffff
; mcall 47,0x80000,[temp_znak],<500, 5>,0xffffff
; mcall 47,0x80000,[sort_counter],<200, 5>,0xffffff
; mcall 47,0x80000,[temp_edi],<250, 5>,0xffffff
; mcall 47,0x80000,[temp_esi],<300, 5>,0xffffff
; mcall 47,0x80000,[temp_ecx],<350, 5>,0xffffff
; mcall 47,0x80000,[temp_znak],<400, 5>,0xffffff
; movzx ecx,[left_start_draw_cursor_line]
; mcall 47,0x40000, ,<300, 5>,0xffffff
; mcall 47,0x40000,[left_start_draw_line],<400, 5>,0xffffff
; mcall 47,0x40000,[window_width],<100, 5>,0xffffff
; mcall 47,0x40000,[window_high],<130, 5>,0xffffff
; mcall 47,0x80100,[left_panel_x],<200, 5>,0xffffff
; mcall 47,0x80100,[left_panel_y],<250, 5>,0xffffff
; mov edx,[temp_counter_dword_1]
; mcall 4,<150,3>,0x80000000
; mov edx,[temp_counter_dword]
; mcall 4,<5,3>,0x80000000
.exit:
mcall 12, 2
ret
;temp_eax dd 0
;temp_ebx dd 0
;temp_ecx dd 0
;temp_edx dd 0
;temp_esi dd 0
;temp_edi dd 0
;temp_ebp dd 0
;temp_esp dd 0
;temp_znak dd 0
;temp_counter_dword_1 dd 0
;extension_size_1 dd 0
;timer_tick dd 0
;---------------------------------------------------------------------
prepare_load_data:
mov esi,path
@ -367,8 +287,6 @@ load_initiation_file:
jnz initiation_error
mov ebp,icons_associations
call search_star_and_end_tags
; cmp ebp,-1
; je .end
mov eax,[end_tag]
mov [icons_end_tag],eax
ret
@ -396,7 +314,6 @@ copy_path:
test eax,eax
jnz @b
mov esi,edi
; dec esi
@@:
std
lodsb