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

OpenDialog uses system colors is now

Browse Source 
git-svn-id: svn://kolibrios.org@3808 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-07-11 12:07:54 +00:00
parent b4a333c297
commit 89c2639856
1 changed files with 94 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
programs/fs/opendial/opendial.asm
View File

@ -1313,9 +1313,13 @@ draw_window:
mcall 12,1 mcall 12,1
call prepare_system_colors
; mcall 0,<10,420>,<10,320>,0x63AABBCC, ; mcall 0,<10,420>,<10,320>,0x63AABBCC,
xor esi,esi xor esi,esi
mcall 0,[window_x],[window_y],0x63AABBCC, ; mov edx,[w_work] ; color of work area RRGGBB,8->color
; or edx,0x63000000
mcall 0,[window_x],[window_y],0x63AABBCC
; mov ecx,[communication_area] ; mov ecx,[communication_area]
; add ecx,4096+4+4 ; add ecx,4096+4+4
@ -1337,8 +1341,9 @@ draw_window:
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
mcall 13,[window_width],45,0xcccccc or edx,0x63000000
mcall 13,[window_width],45 ;,0xcccccc
push ecx push ecx
rol ecx,16 rol ecx,16
@ -1382,13 +1387,15 @@ draw_window:
sub ebx,eax sub ebx,eax
mov ecx,26 shl 16+15 mov ecx,26 shl 16+15
mcall 8,,,2,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,20 shl 16+2
mcall 4,,0x90000000,message_ExitDir_button mov ecx,[w_work_button_text]
or ecx,0x90000000
mcall 4,,,message_ExitDir_button
add ebx,4 add ebx,4
mcall mcall
add ebx,4 add ebx,4
@ -1403,7 +1410,9 @@ draw_window:
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,5 shl 16+4 add ebx,5 shl 16+4
mcall 4,,0x90000000,message_ReloadDir_button mov ecx,[w_work_button_text]
or ecx,0x90000000
mcall 4,,,message_ReloadDir_button
pop ebx pop ebx
mov ebx,[file_browser_data_1.x] mov ebx,[file_browser_data_1.x]
@ -1430,7 +1439,9 @@ draw_window:
shr ecx,16 shr ecx,16
mov bx,cx mov bx,cx
add ebx,6 shl 16+ 4 add ebx,6 shl 16+ 4
mcall 4,,0x90000000,message_cancel_button mov ecx,[w_work_button_text]
or ecx,0x90000000
mcall 4,,,message_cancel_button
popa popa
sub ebx,65 shl 16 sub ebx,65 shl 16
@ -1449,8 +1460,9 @@ draw_window:
jne @f jne @f
sub ebx,5 shl 16 sub ebx,5 shl 16
@@: @@:
mov ecx,[w_work_button_text]
mcall 4,,0x90000000 ;message_open_button or ecx,0x90000000
mcall 4 ;message_open_button
; mcall 47,0x80000,[file_browser_data_1.ini_file_start],<250,0>,0x0 ; mcall 47,0x80000,[file_browser_data_1.ini_file_start],<250,0>,0x0
; mcall 4,<3,420>,0,fb_extension_start,3 ; mcall 4,<3,420>,0,fb_extension_start,3
@ -1459,6 +1471,45 @@ draw_window:
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
prepare_system_colors:
mcall 48,3,app_colours,10*4
mov eax,[w_work]
mov [menu_data_1.bckg_col],eax
mov [menu_data_2.bckg_col],eax
mov [menu_data_3.bckg_col],eax
mov [menu_data_1.menu_col],eax
mov [menu_data_2.menu_col],eax
mov [menu_data_3.menu_col],eax
mov [scroll_bar_data_vertical.bckg_col],eax
mov eax,[w_work_button]
mov [menu_data_1.frnt_col],eax
mov [menu_data_2.frnt_col],eax
mov [menu_data_3.frnt_col],eax
mov [scroll_bar_data_vertical.frnt_col],eax
mov eax,[w_work_button]
mov [menu_data_1.menu_sel_col],eax
mov [menu_data_2.menu_sel_col],eax
mov [menu_data_3.menu_sel_col],eax
mov eax,[w_work_text]
mov [menu_data_1.bckg_text_col],eax
mov [menu_data_2.bckg_text_col],eax
mov [menu_data_3.bckg_text_col],eax
mov eax,[w_work_button_text]
mov [menu_data_1.frnt_text_col],eax
mov [menu_data_2.frnt_text_col],eax
mov [menu_data_3.frnt_text_col],eax
mov [scroll_bar_data_vertical.line_col],eax
ret
;---------------------------------------------------------------------
draw_for_fs_errors: draw_for_fs_errors:
call draw_dir_path call draw_dir_path
@ -1573,32 +1624,32 @@ draw_dir_path:
mov [PathShow_data_1.area_size_x],ax mov [PathShow_data_1.area_size_x],ax
mov [PathShow_data_1.start_x],bx mov [PathShow_data_1.start_x],bx
;-------------------------------------- ;--------------------------------------
; top line ;; top line
mov ebx,[file_browser_data_1.x] ; mov ebx,[file_browser_data_1.x]
mcall 13,,<7,1>,0x0 ; mcall 13,,<7,1>,0x0
; down line ; down line
push ebx ecx ; push ebx ecx
mcall ,,<21,1>, ; mcall ,,<21,1>,
pop ecx ebx ; pop ecx ebx
; left line ; left line
push ebx ; push ebx
mov bx,1 ; mov bx,1
mov cx,15 ; mov cx,15
mcall ; mcall
pop ebx ; pop ebx
; right line ; right line
mov ax,bx ; mov ax,bx
shr ebx,16 ; shr ebx,16
add bx,ax ; add bx,ax
dec ebx ; dec ebx
shl ebx,16 ; shl ebx,16
mov bx,1 ; mov bx,1
mcall 13 ; mcall 13
;-------------------------------------- ;--------------------------------------
mov ebx,[file_browser_data_1.x] mov ebx,[file_browser_data_1.x]
sub ebx,2 sub ebx,2
add ebx,1 shl 16 add ebx,1 shl 16
mcall 13,,<8,13>,0xffffff mcall 13,,<8,13>,0xffffcc
;-------------------------------------- ;--------------------------------------
; prepare for PathShow ; prepare for PathShow
push dword PathShow_data_1 push dword PathShow_data_1
@ -2992,6 +3043,21 @@ example_name_temp:
db 'temp1.asm',0 db 'temp1.asm',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
IM_END: IM_END:
;---------------------------------------------------------------------
align 4
app_colours:
w_frame rd 1
w_grab rd 1
w_grab_button rd 1
w_grab_button_text rd 1
w_grab_text rd 1
w_work rd 1
w_work_button rd 1
w_work_button_text rd 1
w_work_text rd 1
w_work_graph rd 1
;---------------------------------------------------------------------
menu_text_area_1_1: menu_text_area_1_1:
rb 256 rb 256
;--------------------------------------------------------------------- ;---------------------------------------------------------------------