KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

fixed bug with windows active/inactive caption (aw_yes variable converted to parameter).

Browse Source 
git-svn-id: svn://kolibrios.org@35 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Andrey Halyavin (halyavin) 2006-01-11 10:18:52 +00:00
parent cc2477709a
commit e32f2c8d1f
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/trunk/gui/skincode.inc
View File

@ -241,6 +241,7 @@ load_default_skin_1:
ret ret
drawwindow_IV: drawwindow_IV:
;param1 - aw_yes
pusha pusha
@ -290,14 +291,11 @@ drawwindow_IV:
shl ecx,16 shl ecx,16
add ecx,[_skinh] add ecx,[_skinh]
cmp [aw_yes],1 cmp byte [esp+32+4+4],1
; cmp [esp+32+4+2], word 1 mov ebx, [_refleft_1]
jne @f jne @f
mov ebx,[_refleft] mov ebx,[_refleft]
jmp no_aw_3
@@: @@:
mov ebx,[_refleft_1]
no_aw_3:
call sys_putimage call sys_putimage
mov esi,[esp] mov esi,[esp]
@ -312,14 +310,12 @@ drawwindow_IV:
inc eax inc eax
cmp [aw_yes],1 cmp byte [esp+32+4+4], 1
; cmp [esp+32+4+2], word 1 mov ebx,[_refbase_1]
jne @f jne @f
mov ebx,[_refbase] mov ebx,[_refbase]
jmp no_aw_2
@@: @@:
mov ebx,[_refbase_1]
no_aw_2:
mov ecx,[_skinbasew] mov ecx,[_skinbasew]
shl ecx,16 shl ecx,16
add ecx,[_skinh] add ecx,[_skinh]
@ -344,14 +340,12 @@ drawwindow_IV:
sub edx,[_skinoperw] sub edx,[_skinoperw]
inc edx inc edx
shl edx,16 shl edx,16
cmp [aw_yes],1 cmp byte [esp+32+4+4], 1
; cmp [esp+32+4+2], word 1 mov ebx,[_refoper_1]
jne @f jne @f
mov ebx,[_refoper] mov ebx,[_refoper]
jmp no_aw_1
@@: @@:
mov ebx,[_refoper_1]
no_aw_1:
mov ecx,[_skinoperw] mov ecx,[_skinoperw]
shl ecx,16 shl ecx,16
add ecx,[_skinh] add ecx,[_skinh]
@ -454,6 +448,6 @@ drawwindow_IV:
add esp,4 add esp,4
popa popa
ret ret 4

10
kernel/trunk/kernel.asm
View File

@ -2827,19 +2827,16 @@ sys_drawwindow:
sub edi,0x3000 sub edi,0x3000
shr edi,5 shr edi,5
cmp edi,[active_process] cmp edi,[active_process]
push 0
jne @f jne @f
mov [aw_yes],1 mov byte [esp],1
jmp aw_yes_end @@: ; parameter for drawwindow_IV
@@:
mov [aw_yes],0
aw_yes_end:
sti sti
inc [mouse_pause] inc [mouse_pause]
call sys_set_window call sys_set_window
call drawwindow_IV call drawwindow_IV
dec [mouse_pause] dec [mouse_pause]
mov [aw_yes],0
ret ret
nosyswIV: nosyswIV:
@ -4887,7 +4884,6 @@ uglobal
;* start code - get process (3) - Mario79 ;* start code - get process (3) - Mario79
active_process dd 0 active_process dd 0
active_process_flag db 0 active_process_flag db 0
aw_yes db 0
deleted_process dd 0 deleted_process dd 0
mouse_pause dd 0 mouse_pause dd 0
ps2_mouse_detected db 0 ps2_mouse_detected db 0