Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3920 → Rev 3921

/programs/system/icon_new/RButton.inc
63,7 → 63,7
 
xor ebx,ebx
mov bx,[RMenuW]
mov esi,0888888h
mov esi,[RBMenuColor];0888888h
mcall 8
 
mov ebx,50000h
93,7 → 93,7
mov cx,dx
 
;¯¥à¢ ï à §¤¥«¨â¥«ì­ ï «¨­¨ï
mcall 38,,,0888888h
mcall 38,,,[RBMenuColor];0888888h
add ecx,00010001h
mcall ,,,
 
103,7 → 103,7
shl ecx,16
mov cx,16
 
mcall 8,,,idbRRedrawFon,0888888h ;3 ª­®¯ª¨ ¢â®à®£® ¡«®ª 
mcall 8,,,idbRRedrawFon,[RBMenuColor];0888888h ;3 ª­®¯ª¨ ¢â®à®£® ¡«®ª 
add ecx,00100000h
mcall ,,,idbRAlign
add ecx,00100000h
134,7 → 134,7
mov dx,cx
shl ecx,16
mov cx,dx
mcall 38,,,0888888h
mcall 38,,,[RBMenuColor];0888888h
add ecx,00010001h
mcall ,,,
;------------
146,9 → 146,9
cmp dword[SelIcon],-1
je @f
 
mcall 8,,,idbRDel,0888888h
mcall 8,,,idbRDel,[RBMenuColor];0888888h
add ecx,00100000h
mcall ,,,idbRProp,0888888h
mcall ,,,idbRProp,[RBMenuColor];0888888h
 
mov ebx,50000h
mov bx,word[esp]
160,7 → 160,7
jmp .endRM
@@:
 
mcall 8,,,idbRAdd,0888888h
mcall 8,,,idbRAdd,[RBMenuColor];0888888h
mov ebx,50000h
mov bx,word[esp]
add bx,16*3+4+5
266,7 → 266,10
jmp RBWExit
 
RBAdd:
; mov [DlgAddActiv],1
cmp [DlgAddActiv],1
je RBWSetActivWin
mov [DlgAddActiv],1
 
mcall 51,1,DlgAdd,stack_dlg ;CreateThread DlgAdd,stack_dlg
jmp RBWExit
 
289,10 → 292,16
jmp RBRedrawFon
 
RBPropeties:
; mov [DlgAddActiv],1
cmp [DlgAddActiv],1
je RBWSetActivWin
mov [DlgAddActiv],1
 
mcall 51,1,DlgProp,stack_dlg ;CreateThread DlgProp,stack_dlg
jmp RBWExit
 
RBWSetActivWin:
mcall 18,3,[slotDlgAdd]
jmp RBWExit
 
 
proc AlignIcons
443,6 → 452,19
 
push ebx esi edi
 
mov edi,[key_name]
mov esi,keyMenuColor
@@: lodsb
scasb
jne @f
test al,al
jnz @b
 
stdcall [ini_get_color],[f_name],[sec_name],[key_name],0888888h
mov [RBMenuColor],eax
ret
@@:
 
mov edi,[key_name] ;®¯à¥¤¥«ï¥¬ è¨à¨­ã ¬¥­î
xor eax,eax
or ecx,-1
491,7 → 513,7
 
proc Ini_SavePos stdcall,f_name,sec_name
push ebx edi esi
;int3
 
xor ebx,ebx
.SearchSect:
mov edi,[IconsOffs+ebx*4]
520,6 → 542,7
repne scasb
repne scasb
 
;int3
movzx eax,word[edi+2]
test eax,8000h
jz @f