XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

@panel: fixes

Browse Source 
git-svn-id: svn://kolibrios.org@2195 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2011-09-16 13:31:37 +00:00
parent a5ef4a9625
commit a9700f0e2f
2 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
programs/system/panel/trunk/@PANEL.ASM
View File

@ -1988,27 +1988,20 @@ draw_info: ; draw cpu usage, time, date
add ecx,[b_size_y] add ecx,[b_size_y]
; dec ecx ; dec ecx
sub cx,5 sub cx,5
mov edx,2+0x20000000 mov edx,0x40000002
mov esi,[wcolor] mov esi,[wcolor]
int 0x40 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 and edx,0xffff
add edx,[button_frames] add edx,[button_frames]
int 0x40 int 0x40
mov eax,8 mov eax,8 ;other tray buttons
mov ebx,[maxx] mov ebx,[maxx]
sub ebx,77 ;80 sub ebx,77 ;80
shl ebx,16 shl ebx,16
add ebx,12 add ebx,14
mov ecx,5 shl 16+10 mov ecx,4 shl 16+12
mov edx,16+0x20000000 ;button 16 mov edx,16+0x40000000+0x20000000 ;button 16
mov esi,[wcolor] mov esi,[wcolor]
int 0x40 int 0x40
sub ebx,17 shl 16 sub ebx,17 shl 16

40
programs/system/panel/trunk/ctx_menu.asm
View File

@ -112,10 +112,7 @@ context_menu_start:
func draw_ctx_menu func draw_ctx_menu
mov eax, 12 mcall 12, 1
xor ebx, ebx ; mov ebx, 1
inc ebx
int 0x40
xor eax, eax ; mov eax, 0 xor eax, eax ; mov eax, 0
movzx ebx, [x_coord] movzx ebx, [x_coord]
@ -133,16 +130,19 @@ func draw_ctx_menu
mov eax, 8 mov eax, 8
mov ebx, 0 * 65536 + 133 mov ebx, 0 * 65536 + 133
mov ecx, 22 * 65536 + 16 mov ecx, 22 * 65536 + 17
mov edx, 0x40000001 mov edx, 0x40000001
int 0x40 int 0x40
mov eax, 8 ;mov eax, 8
mov ebx, 0 * 65536 + 133 ;mov ebx, 0 * 65536 + 133
mov ecx, 40 * 65536 + 18 ;mov ecx, 40 * 65536 + 17
mov edx, 0x40000002 ;mov edx, 0x40000002
;int 0x40
mov ecx, 40 * 65536 + 17
inc edx
int 0x40 int 0x40
shr eax, 1 ; mov eax, 4 shr eax, 1 ; mov eax, 4
mov ebx, 36 * 65536 + 7 mov ebx, 36 * 65536 + 7
mov ecx, [system_colours + 16] ; sc.grab_text mov ecx, [system_colours + 16] ; sc.grab_text
@ -159,22 +159,20 @@ func draw_ctx_menu
mov ebx, 4 * 65536 + 28 mov ebx, 4 * 65536 + 28
mov ecx, 0x80000000 mov ecx, 0x80000000
mov edx, ctx_menu_text mov edx, ctx_menu_text
; // Alver 26.08.2007 // {
int 0x40 int 0x40
add bx, 18 add bx, 18
mov edx, ctx_menu_text2 mov edx, ctx_menu_text2
; \begin{diamond}[20.09.2007]
test byte [procinfo_for_detect+70], 2 test byte [procinfo_for_detect+70], 2
jz @f jz @f
mov edx, ctx_menu_text3 mov edx, ctx_menu_text3
@@: @@:
; \end{diamond}[20.09.2007]
int 0x40
; } \\ Alver \\
mov eax, 12
mov ebx, ebp ; mov ebx, 2
int 0x40 int 0x40
mcall 12, 2
ret ret
endf endf
@ -185,17 +183,15 @@ n_slot rd 1
lsz ctx_menu_text,\ lsz ctx_menu_text,\
ru, <"X ‡ ªàëâì Alt + F4",0>,\ ru, <"X ‡ ªàëâì Alt + F4",0>,\
en, <"X Close 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,\ lsz ctx_menu_text2,\
ru, <25," ‘¢¥à­ãâì ",0>,\ ru, <25," ‘¢¥à­ãâì ",0>,\
en, <25," Minimize ",0>,\ en, <25," Minimize ",0>,\
; } \\ Alver \\
; \begin{diamond}[20.09.2007]
lsz ctx_menu_text3,\ lsz ctx_menu_text3,\
ru, <24," ‚®ááâ ­®¢¨âì ",0>,\ ru, <24," ‚®ááâ ­®¢¨âì ",0>,\
en, <24," Restore ",0> en, <24," Restore ",0>
; \end{diamond}[20.09.2007]
ctx_menu_PID rd 1 ctx_menu_PID rd 1
ctx_menu_title: ctx_menu_title: