OpenDialog: button text fix

git-svn-id: svn://kolibrios.org@5878 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pathoswithin 2015-11-03 23:26:05 +00:00
parent 161e070ff1
commit bc241b6429

View File

@ -1392,20 +1392,11 @@ type_title:
draw_window: draw_window:
mcall 12,1 mcall 12,1
call prepare_system_colors call prepare_system_colors
; mcall 0,<10,420>,<10,320>,0x63AABBCC,
xor esi,esi xor esi,esi
; mov edx,[w_work] ; color of work area RRGGBB,8->color
; or edx,0x63000000
mcall 0,[window_x],[window_y],0x63AABBCC mcall 0,[window_x],[window_y],0x63AABBCC
; mov ecx,[communication_area]
; add ecx,4096+4+4
call type_title call type_title
call get_window_param call get_window_param
mov eax,[procinfo+70] ;status of window mov eax,[procinfo+70] ;status of window
test eax,100b test eax,100b
jne .end jne .end
@ -1414,13 +1405,11 @@ draw_window:
sub eax,25+45 sub eax,25+45
mov [file_browser_data_1.size_y],ax mov [file_browser_data_1.size_y],ax
mov [scroll_bar_data_vertical.size_y],ax mov [scroll_bar_data_vertical.size_y],ax
mov eax,[window_width] mov eax,[window_width]
sub eax,10+20 sub eax,10+20
mov [file_browser_data_1.size_x],ax mov [file_browser_data_1.size_x],ax
add ax,10 add ax,10
mov [scroll_bar_data_vertical.start_x],ax mov [scroll_bar_data_vertical.start_x],ax
mov edx,[w_work] ; color of work area RRGGBB,8->color mov edx,[w_work] ; color of work area RRGGBB,8->color
or edx,0x63000000 or edx,0x63000000
mcall 13,[window_width],45 ;,0xcccccc mcall 13,[window_width],45 ;,0xcccccc
@ -1467,14 +1456,13 @@ draw_window:
mov bx,ax mov bx,ax
shl eax,16 shl eax,16
sub ebx,eax sub ebx,eax
mov ecx,26 shl 16+15 mov ecx,25 shl 16 + 16
mcall 8,,,2,[w_work_button] ;0xffffff mcall 8,,,2,[w_work_button] ;0xffffff
pusha pusha
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,20 shl 16+2 add ebx,21 shl 16
mov ecx,[w_work_button_text] mov ecx,[w_work_button_text]
or ecx,0x90000000 or ecx,0x90000000
mcall 4,,,message_ExitDir_button mcall 4,,,message_ExitDir_button
@ -1491,14 +1479,13 @@ draw_window:
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,5 shl 16+4 add ebx,2 shl 16
mov ecx,[w_work_button_text] mov ecx,[w_work_button_text]
or ecx,0x90000000 or ecx,0x90000000
mcall 4,,,message_ReloadDir_button mcall 4,,,message_ReloadDir_button
pop ebx pop ebx
mov ebx,[file_browser_data_1.x] mov ebx,[file_browser_data_1.x]
mov ax,bx mov ax,bx
shl eax,16 shl eax,16
add ebx,eax add ebx,eax
@ -1506,21 +1493,18 @@ draw_window:
mov bx,ax mov bx,ax
shl eax,16 shl eax,16
sub ebx,eax sub ebx,eax
mov ecx,[file_browser_data_1.y] mov ecx,[file_browser_data_1.y]
mov ax,cx mov ax,cx
add eax,3 add eax,3
shl eax,16 shl eax,16
add ecx,eax add ecx,eax
mov cx,15 mov cx,16
mcall 8,,,3 mcall 8,,,3
pusha pusha
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,6 shl 16+ 4 add ebx,4 shl 16
mov ecx,[w_work_button_text] mov ecx,[w_work_button_text]
or ecx,0x90000000 or ecx,0x90000000
mcall 4,,,message_cancel_button mcall 4,,,message_cancel_button
@ -1531,13 +1515,12 @@ draw_window:
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,6 shl 16+4 add ebx,4 shl 16
mov edx,[open_dialog_type] mov edx,[open_dialog_type]
shl edx,2 shl edx,2
add edx,message_open_dialog_button add edx,message_open_dialog_button
mov edx,[edx] mov edx,[edx]
;-------------------------------------- ;-------------------------------
cmp [open_dialog_type],1 cmp [open_dialog_type],1
jne @f jne @f
@ -1562,12 +1545,8 @@ draw_window:
mov ecx,[w_work_button_text] mov ecx,[w_work_button_text]
or ecx,0x90000000 or ecx,0x90000000
mcall 4 ;message_open_button mcall 4 ;message_open_button
; mcall 47,0x80000,[file_browser_data_1.ini_file_start],<250,0>,0x0
; mcall 4,<3,420>,0,fb_extension_start,3
.end: .end:
mcall 12,2 mcall 12,2
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
draw_open_button_label: draw_open_button_label:
@ -1745,7 +1724,7 @@ draw_for_fs_errors:
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,4 shl 16+4 add ebx,4 shl 16
mov ecx,[w_work_button_text] mov ecx,[w_work_button_text]
add ecx,0x90000000 add ecx,0x90000000
mcall 4,,,message_cancel_button mcall 4,,,message_cancel_button