From 7ba87363fb8d714795f4a40c076ad2c2aa8fc556 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Wed, 19 Jan 2011 20:31:51 +0000 Subject: [PATCH] alt+f4 fix for @menu. now it closes all the tree. such fix is still needed for @panel git-svn-id: svn://kolibrios.org@1754 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/menu/trunk/menu.asm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index fa2c5cde27..50a59ab627 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -190,7 +190,11 @@ still: button: ; BUTTON HANDLER mov eax, 17 ; get id mcall - + ; dunkaist[ + test eax,0xfffffe00 ; is it system close button? (close signal from @panel) + setz byte[close_now]; set (or not set) close_recursive flag + jz close ; if so, close all menus + ; dunkaist] button1: mov esi, edi push edi @@ -486,6 +490,9 @@ draw_window: add esi, 0x1a1a1a .nohighlight: or edx, 0x20000000 + ; dunkaist[ + add edx, 0xd1ff00 ; This makes first menu buttons differ from system close button with 0x000001 id + ; dunkaist] mcall movzx edx, dl