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

Temporary fix in "check_window_position". In future we need negative coordinates support without this procedure :-)

Browse Source 
git-svn-id: svn://kolibrios.org@768 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
heavyiron 2008-03-07 11:56:20 +00:00
parent e5d49b5269
commit 88d5b111cd
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
kernel/trunk/gui/window.inc
View File

@ -562,43 +562,55 @@ check_window_position:
pushad ; window inside screen ? pushad ; window inside screen ?
movzx eax,word [edi+WDATA.box.left] movsx eax,word [edi+WDATA.box.left]
movzx ebx,word [edi+WDATA.box.top] movsx ebx,word [edi+WDATA.box.top]
movzx ecx,word [edi+WDATA.box.width] movsx ecx,word [edi+WDATA.box.width]
movzx edx,word [edi+WDATA.box.height] movsx edx,word [edi+WDATA.box.height]
mov esi,ecx ; check x pos cmp ecx,[Screen_Max_X] ; check x size
add esi,eax
cmp esi,[Screen_Max_X]
jbe x_pos_ok
mov [edi+WDATA.box.left],dword 0
xor eax, eax
x_pos_ok:
mov esi,edx ; check y pos
add esi,ebx
cmp esi,[Screen_Max_Y]
jbe y_pos_ok
mov [edi+WDATA.box.top],dword 0
mov ebx,0
y_pos_ok:
mov esi,ecx ; check x size
add esi,eax
cmp esi,[Screen_Max_X]
jbe x_size_ok jbe x_size_ok
mov ecx,[Screen_Max_X] mov ecx,[Screen_Max_X]
mov [edi+WDATA.box.width],ecx mov [edi+WDATA.box.width],ecx
x_size_ok: x_size_ok:
mov esi,edx ; check y size cmp edx,[Screen_Max_Y] ; check y size
add esi,ebx
cmp esi,[Screen_Max_Y]
jbe y_size_ok jbe y_size_ok
mov edx,[Screen_Max_Y] mov edx,[Screen_Max_Y]
mov [edi+WDATA.box.height],edx mov [edi+WDATA.box.height],edx
y_size_ok: y_size_ok:
cmp eax,0 ; check x pos
jnle @f
xor eax,eax
mov [edi+WDATA.box.left],eax
jmp x_pos_ok
@@:
add eax,ecx
cmp eax,[Screen_Max_X]
jbe x_pos_ok
mov eax,[Screen_Max_X]
sub eax,ecx
mov [edi+WDATA.box.left],eax
x_pos_ok:
cmp ebx,0 ; check x pos
jnle @f
xor ebx,ebx
mov [edi+WDATA.box.top],ebx
jmp y_pos_ok
@@:
add ebx,edx
cmp ebx,[Screen_Max_Y]
jbe y_pos_ok
mov ebx,[Screen_Max_Y]
sub ebx,edx
mov [edi+WDATA.box.top],ebx
y_pos_ok:
popad popad
ret ret