From a9700f0e2f2e263ac01047eca1e4d2b606e39a5d Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Fri, 16 Sep 2011 13:31:37 +0000
Subject: [PATCH] @panel: fixes

git-svn-id: svn://kolibrios.org@2195 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/panel/trunk/@PANEL.ASM   | 17 +++-------
 programs/system/panel/trunk/ctx_menu.asm | 40 +++++++++++-------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/programs/system/panel/trunk/@PANEL.ASM b/programs/system/panel/trunk/@PANEL.ASM
index a6b8a95746..1ee96fbdb7 100644
--- a/programs/system/panel/trunk/@PANEL.ASM
+++ b/programs/system/panel/trunk/@PANEL.ASM
@@ -1988,27 +1988,20 @@ draw_info:    ; draw cpu usage, time, date
     add  ecx,[b_size_y]
 ;    dec  ecx
     sub  cx,5
-    mov  edx,2+0x20000000
+    mov  edx,0x40000002
     mov  esi,[wcolor]
     int  0x40
-    pusha
-    mov  eax,13
-    add  ebx,10*65536-16
-    add  ecx,5*65536-8
-    mov  edx,[wcolor]
-    int  0x40
-    popa
     and  edx,0xffff
     add  edx,[button_frames]
     int  0x40
 
-    mov  eax,8
+    mov  eax,8                 ;other tray buttons
     mov  ebx,[maxx]
     sub  ebx,77 ;80
     shl  ebx,16
-    add  ebx,12
-    mov  ecx,5 shl 16+10
-    mov  edx,16+0x20000000  ;button 16
+    add  ebx,14
+    mov  ecx,4 shl 16+12
+    mov  edx,16+0x40000000+0x20000000  ;button 16
     mov  esi,[wcolor]
     int  0x40
     sub  ebx,17 shl 16
diff --git a/programs/system/panel/trunk/ctx_menu.asm b/programs/system/panel/trunk/ctx_menu.asm
index 4cee5d21fe..5d5a0d9c37 100644
--- a/programs/system/panel/trunk/ctx_menu.asm
+++ b/programs/system/panel/trunk/ctx_menu.asm
@@ -112,10 +112,7 @@ context_menu_start:
 
 func  draw_ctx_menu
 
-    mov        eax, 12
-    xor        ebx, ebx 	; mov        ebx, 1
-    inc        ebx
-    int        0x40
+    mcall 12, 1
 
     xor        eax, eax 	; mov        eax, 0
     movzx      ebx, [x_coord]
@@ -133,16 +130,19 @@ func  draw_ctx_menu
 
     mov        eax, 8
     mov        ebx, 0 * 65536 + 133
-    mov        ecx, 22 * 65536 + 16
+    mov        ecx, 22 * 65536 + 17
     mov        edx, 0x40000001
     int        0x40
 
-    mov        eax, 8
-    mov        ebx, 0 * 65536 + 133
-    mov        ecx, 40 * 65536 + 18
-    mov        edx, 0x40000002
+    ;mov        eax, 8
+    ;mov        ebx, 0 * 65536 + 133
+    ;mov        ecx, 40 * 65536 + 17
+    ;mov        edx, 0x40000002
+    ;int        0x40
+	mov        ecx, 40 * 65536 + 17
+	inc        edx
     int        0x40
-
+	
     shr        eax, 1	; mov   eax, 4
     mov        ebx, 36 * 65536 + 7
     mov        ecx, [system_colours + 16]    ; sc.grab_text
@@ -159,22 +159,20 @@ func  draw_ctx_menu
     mov        ebx, 4 * 65536 + 28
     mov        ecx, 0x80000000
     mov        edx, ctx_menu_text
-; // Alver 26.08.2007 // {
+
     int        0x40
     add        bx, 18
     mov        edx, ctx_menu_text2
-; \begin{diamond}[20.09.2007]
+
     test       byte [procinfo_for_detect+70], 2
     jz         @f
     mov        edx, ctx_menu_text3
 @@:
-; \end{diamond}[20.09.2007]
-    int        0x40
-; } \\ Alver \\
-    mov        eax, 12
-    mov        ebx, ebp 	; mov     ebx, 2
+
     int        0x40
 
+    mcall 12, 2
+
     ret
 
 endf
@@ -185,17 +183,15 @@ n_slot	rd	1
 lsz ctx_menu_text,\
   ru, <"X Закрыть    Alt + F4",0>,\
   en, <"X Close      Alt + F4",0>,\
-  et, <"X Sulge      Alt + F4",0>      ; Now correct
-; // Alver 26.08.2007 // {
+
 lsz ctx_menu_text2,\
   ru, <25," Свернуть           ",0>,\
   en, <25," Minimize           ",0>,\
-; } \\ Alver \\
-; \begin{diamond}[20.09.2007]
+
 lsz ctx_menu_text3,\
   ru, <24," Восстановить       ",0>,\
   en, <24," Restore            ",0>
-; \end{diamond}[20.09.2007]
+
 ctx_menu_PID	rd	1
 
 ctx_menu_title: