Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6218 → Rev 6219

/programs/macros.inc
467,11 → 467,11
ends
 
struct system_colors
taskbar dd ? ;frame
taskbar_text dd ? ;grab
frame dd ? ;nonset1
grab dd ? ;nonset2
work_3d_dark dd ?
work_3d_light dd ?
window_title dd ? ;grab_text
grab_text dd ? ;nonset3
work dd ?
work_button dd ?
work_button_text dd ?
/programs/system/taskbar/trunk/drawappl.inc
145,7 → 145,7
add ebx,TAB_SIZE-2 ;54
 
push edi
mov edx,[system_colours.taskbar]
mov edx,[system_colours.work_button]
xor edi,edi
 
cmp ebp,[active_slot_number] ;ecx ; ecx=active slot number
181,7 → 181,7
add bx,cx
mov edx, procinfo_window_tabs+10
mcall 4,,[system_colours.taskbar_text],,11
mcall 4,,[system_colours.work_button_text],,11
;--------------------------------------
align 4
.nodraw:
/programs/system/taskbar/trunk/drawtray.inc
192,7 → 192,7
; draw page list number
mov edx,ebx
add edx,9 shl 16
mcall 47,0x20000,[page_list],,[system_colours.taskbar_text]
mcall 47,0x20000,[page_list],,[system_colours.work_button_text]
@@:
ret
;---------------------------------------------------------------
/programs/system/taskbar/trunk/drawwind.inc
10,8 → 10,8
 
mcall 48,3,system_colours,10*4
 
mov eax, [system_colours.taskbar]
mov edx,[system_colours.taskbar]
mov eax, [system_colours+4*6]
mov edx,[system_colours+4*6]
mov eax,COLOR_CHANGE_MAGNITUDE
call subtract_color_change_magnitude
mov [wcolor], edx