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

Fix f.18.3 - If the window is captured and moved by the user, then you can't change the position in window stack.

Browse Source 
git-svn-id: svn://kolibrios.org@3455 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-04-07 16:11:35 +00:00
parent 53d7a1b52f
commit 37684e0d2a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/trunk/kernel.asm
View File

@ -2201,13 +2201,24 @@ sysfn_deactivate: ; 18.1 = DEACTIVATE WINDOW
call syscall_display_settings._.redraw_whole_screen call syscall_display_settings._.redraw_whole_screen
.nowindowdeactivate: .nowindowdeactivate:
ret ret
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
sysfn_activate: ; 18.3 = ACTIVATE WINDOW sysfn_activate: ; 18.3 = ACTIVATE WINDOW
cmp ecx, 2 cmp ecx, 2
jb .nowindowactivate jb .nowindowactivate
cmp ecx, [TASK_COUNT] cmp ecx, [TASK_COUNT]
ja .nowindowactivate ja .nowindowactivate
;-------------------------------------
@@:
; If the window is captured and moved by the user,
; then you can't change the position in window stack!!!
mov al, [mouse.active_sys_window.action]
and al, WINDOW_MOVE_AND_RESIZE_FLAGS
test al, al
jz @f
call change_task
jmp @b
@@:
;-------------------------------------
mov [window_minimize], 2; restore window if minimized mov [window_minimize], 2; restore window if minimized
movzx esi, word [WIN_STACK + ecx*2] movzx esi, word [WIN_STACK + ecx*2]