From 132b516d92d1ef425e92680700e82ed3c1dd4b5c Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 23 Sep 2011 02:33:18 +0000 Subject: [PATCH] alternative fix for r.1474 git-svn-id: svn://kolibrios.org@2233 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/gui/window.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc index 3ed545ab66..f66598534b 100644 --- a/kernel/trunk/gui/window.inc +++ b/kernel/trunk/gui/window.inc @@ -1163,7 +1163,7 @@ sys_window_end_moving_handler: ;/////////////////////////////////////////////// ;> esi = process slot ;------------------------------------------------------------------------------ mov edi, ebx - call window._.draw_negative_box + call window._.end_moving__box mov edi, esi shl edi, 5 @@ -1306,18 +1306,7 @@ end if mov ecx, 4 repz cmpsd pop edi - jnz @f - - mov edi,eax - mov eax, [edi + BOX.left - 2] - mov ax, word[edi + BOX.left] - add ax, word[edi + BOX.width] - mov ebx, [edi + BOX.top - 2] - mov bx, word[edi + BOX.top] - add bx, word[edi + BOX.height] - xor esi,esi - call draw_rectangle.forced - jmp .exit + jz .exit @@: add esp, -BOX.sizeof @@ -2084,13 +2073,24 @@ window._.draw_negative_box: ;////////////////////////////////////////////////// ;> edi = pointer to BOX struct ;------------------------------------------------------------------------------ push eax ebx esi + mov esi, 0x01000000 +.1: mov eax, [edi + BOX.left - 2] mov ax, word[edi + BOX.left] add ax, word[edi + BOX.width] mov ebx, [edi + BOX.top - 2] mov bx, word[edi + BOX.top] add bx, word[edi + BOX.height] - mov esi, 0x01000000 call draw_rectangle.forced pop esi ebx eax ret +;------------------------------------------------------------------------------ +window._.end_moving__box: ;////////////////////////////////////////////////// +;------------------------------------------------------------------------------ +;? Draw positive box +;------------------------------------------------------------------------------ +;> edi = pointer to BOX struct +;------------------------------------------------------------------------------ + push eax ebx esi + xor esi,esi + jmp window._.draw_negative_box.1 \ No newline at end of file