Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 53 → Rev 54

/kernel/trunk/gui/button.inc
173,6 → 173,11
push ecx
push edx
 
or ax,ax
jle noaddbutt
or bx,bx
jle noaddbutt
 
test ecx,0x40000000
jnz button_no_draw
 
/kernel/trunk/gui/skincode.inc
56,9 → 56,14
mov [_skinh],22
mov eax,_skin_file
mov edx,skin_data
mov [ebp+SKIN_HEADER.ident],'????'
mov [edx+SKIN_HEADER.ident],'????'
call load_skin_file
call parse_skin_data
cmp eax,ERROR_SUCCESS
je @f
cmp eax,ERROR_END_OF_FILE
jne .exit
@@: call parse_skin_data
.exit:
popad
ret
 
67,6 → 72,12
cmp [ebp+SKIN_HEADER.ident],'SKIN'
jne .exit
 
mov edi,skin_udata
mov ecx,(skin_udata.end-skin_udata)/4
xor eax,eax
cld
rep stosd
 
mov ebx,[ebp+SKIN_HEADER.params]
add ebx,skin_data
mov eax,[ebx+SKIN_PARAMS.skin_height]
87,7 → 98,6
mov edi,common_colours
mov ecx,[ebx+SKIN_PARAMS.dtp.size]
and ecx,127
cld
rep movsb
mov eax,dword[ebx+SKIN_PARAMS.margin.right]
mov dword[_skinmargins+0],eax
233,7 → 243,20
js no_skin_add_button
call draw_rectangle
 
cmp dword[skin_data],'SKIN'
je @f
xor eax,eax
xor ebx,ebx
mov esi,[esp]
mov ecx,[esi+8]
inc ecx
mov edx,[_skinh]
mov edi,[common_colours+4] ; standard grab color
call [drawbar]
jmp draw_clientbar
@@:
 
mov esi,[esp]
mov eax,[esi+8] ; window width
mov edx,[ebp+SKIN_DATA.left.left]
shl edx,16
289,6 → 312,8
add ecx,[_skinh]
call sys_putimage_with_check
 
draw_clientbar:
 
mov esi,[esp]
 
mov edx,[esi+04] ; WORK AREA
307,6 → 332,9
call [drawbar]
_noinside2:
 
cmp dword[skin_data],'SKIN'
jne no_skin_add_button
 
;* close button
mov edi,[0xfe88]
movzx eax,word [edi]
/kernel/trunk/gui/skindata.inc
32,6 → 32,7
 
align 4
 
skin_udata:
_skinh dd ?
 
_skinmargins rw 4
44,4 → 45,8
 
_skin_file rb 256
 
align 4
 
skin_udata.end:
 
endg
/kernel/trunk/gui/window.inc
316,7 → 316,9
jne no_com_colours
mov [windowtypechanged],dword 1
mov esi,[0x3010]
add esi,[esi+0x10]
add esi,0x10
add ebx,[esi]
mov esi,ebx
mov edi,common_colours
and ecx,127
cld