Fixed bug with border drawing

git-svn-id: svn://kolibrios.org@163 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2006-10-05 08:37:51 +00:00
parent 2e850e52f6
commit 0e39a3fffe
2 changed files with 8 additions and 12 deletions

View File

@ -1226,7 +1226,6 @@ checkwindows:
ret ret
.move_resize_window: ; MOVE OR RESIZE WINDOW .move_resize_window: ; MOVE OR RESIZE WINDOW
popad popad
; Check for user enabled fixed window ; Check for user enabled fixed window
@ -1321,10 +1320,7 @@ checkwindows:
mov word [npye],ax mov word [npye],ax
pop eax pop eax
test [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
jnz @f
call drawwindowframes call drawwindowframes
@@:
mov [reposition],0 mov [reposition],0
mov [0xfb44],byte 1 ; no reaction to mouse up/down mov [0xfb44],byte 1 ; no reaction to mouse up/down
@ -1359,10 +1355,7 @@ checkwindows:
push ax push ax
push bx push bx
test [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
jnz @f
call drawwindowframes call drawwindowframes
@@:
mov ax,[0xfe00] mov ax,[0xfe00]
mov bx,[0xfe04] mov bx,[0xfe04]
@ -1436,10 +1429,7 @@ checkwindows:
pop bx pop bx
pop ax pop ax
test [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
jnz @f
call drawwindowframes call drawwindowframes
@@:
mov esi,[0xfb0a] mov esi,[0xfb0a]
mov [0xf300],esi mov [0xf300],esi
@ -1658,6 +1648,11 @@ endg
drawwindowframes: drawwindowframes:
test [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
jnz .ret
cmp [edi+WDATA.fl_redraw], 0
jnz .ret
pushad pushad
mov eax,[npx] mov eax,[npx]
@ -1723,7 +1718,7 @@ drawwindowframes:
pop edi pop edi
popad popad
.ret:
ret ret

View File

@ -2749,6 +2749,7 @@ sys_redrawstat:
mov edi,[0x3010] mov edi,[0x3010]
mov [edi-twdw+WDATA.fl_wdrawn], 1 ; no new position & buttons from app mov [edi-twdw+WDATA.fl_wdrawn], 1 ; no new position & buttons from app
mov [edi-twdw+WDATA.fl_redraw], 0
call sys_window_mouse call sys_window_mouse
@ -3058,7 +3059,7 @@ sys_set_window:
mov [0xf500],byte 0 ; empty button buffer mov [0xf500],byte 0 ; empty button buffer
newd: newd:
mov [edi+WDATA.fl_redraw],byte 0 ; no redraw ; mov [edi+WDATA.fl_redraw],byte 0 ; no redraw
mov edx,edi mov edx,edi
ret ret