Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

kpack: fix (buttons and text) position and size

Browse Source 
git-svn-id: svn://kolibrios.org@4978 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Akyltist 2014-06-17 15:05:28 +00:00
parent dd6485818f
commit 54ee05721e
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/other/kpack/trunk/data.inc
View File

@ -2,7 +2,7 @@
params: params:
rb 256 rb 256
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
color_table rd 10 color_table sys_colors_new
innamelen rd 1 innamelen rd 1
inname rb 256 ;48 inname rb 256 ;48

27
programs/other/kpack/trunk/kpack.asm
View File

@ -425,7 +425,7 @@ draw_window:
; start redraw ; start redraw
mcall 12,1 mcall 12,1
mcall 48,3,color_table,40 mcall 48,3,color_table,192
;-------------------------------------- ;--------------------------------------
edit_boxes_set_sys_color edit1,editboxes_end,color_table edit_boxes_set_sys_color edit1,editboxes_end,color_table
check_boxes_set_sys_color2 check1,check1_end,color_table check_boxes_set_sys_color2 check1,check1_end,color_table
@ -433,11 +433,11 @@ check_boxes_set_sys_color2 check1,check1_end,color_table
; define window ; define window
xor eax,eax xor eax,eax
mov ecx,100 shl 16+306 mov ecx,100 shl 16+306
mov edx,[color_table+20] mov edx,[color_table.win_body]
add edx,34000000h add edx,34000000h
xor esi,esi xor esi,esi
xor edi,edi xor edi,edi
mcall ,<100,436>,,,,caption_str mcall ,<100,436>,,,[color_table.win_title],caption_str
mcall 9,procinfo,-1 mcall 9,procinfo,-1
mov eax,[procinfo+70] ;status of window mov eax,[procinfo+70] ;status of window
@ -496,7 +496,7 @@ draw_lines:
; draw frame for messages data ; draw frame for messages data
push ecx push ecx
add ecx,50 shl 16+16 add ecx,50 shl 16+16
mcall 38,<3,423>,,[color_table+36] mcall 38,<3,423>,,[color_table.gui_frame]
add ecx,224*(1 shl 16+1) add ecx,224*(1 shl 16+1)
mcall mcall
sub cx,224 sub cx,224
@ -508,19 +508,20 @@ draw_lines:
draw_buttons: draw_buttons:
; define compress button ; define compress button
mov cx,18 mov cx,18
mcall 8,<351,72>,<1, 17>,2,[color_table+24] mcall 8,<351,73>,<1, 17>,2,[color_table.btn_face]
; uncompress button ; uncompress button
add ecx,18 shl 16 add ecx,18 shl 16
inc edx inc edx
mcall mcall
add ecx,-12h+0Ah+140000h ;add ecx,-12h+0Ch+140000h
mov ecx, 38 shl 16 + 11
; question button ; question button
push esi push esi
mov dl,7 mov dl,7
mcall ,<414,9> mcall ,<413,11>
shr ecx,16 shr ecx,16
lea ebx,[ecx+1A10002h] lea ebx,[ecx+1A00002h]
mcall 4,,[color_table+28],aQuestion,1 mcall 4,,[color_table.btn_text],aQuestion,1
pop esi pop esi
; define settings buttons ; define settings buttons
mov ecx,16*2+2 mov ecx,16*2+2
@ -528,9 +529,9 @@ draw_buttons:
mov cx,13 mov cx,13
mcall 8,<6,50>,,4 mcall 8,<6,50>,,4
; text on settings buttons ; text on settings buttons
mov ebx,9 shl 16+5 mov ebx,8 shl 16+5
mov al,4 mov al,4
mov ecx,[color_table+32] mov ecx,[color_table.win_text]
push buttons1names push buttons1names
pop edx pop edx
push 8 push 8
@ -542,10 +543,10 @@ draw_buttons:
mcall mcall
add edx,esi add edx,esi
add ebx,16 add ebx,16
mov ecx,[color_table+28] mov ecx,[color_table.btn_text]
mcall mcall
; text on compress and decompress buttons ; text on compress and decompress buttons
or ecx,80000000h or ecx,0x80000000
mcall ,<364,6>,,aCompress mcall ,<364,6>,,aCompress
mcall ,<359,24>,,aDecompress mcall ,<359,24>,,aDecompress
ret ret