From 37ce145294d400f57dd57f4dbbf9eaceb52c3b65 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 24 May 2012 22:03:49 +0000 Subject: [PATCH] kpack: changing program colors, while user changed the skin, some small GuI fixes git-svn-id: svn://kolibrios.org@2673 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/other/kpack/trunk/const_var.inc | 2 +- programs/other/kpack/trunk/kpack.asm | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/other/kpack/trunk/const_var.inc b/programs/other/kpack/trunk/const_var.inc index 7bb8598fbb..f51f9fd31c 100644 --- a/programs/other/kpack/trunk/const_var.inc +++ b/programs/other/kpack/trunk/const_var.inc @@ -202,7 +202,7 @@ editboxes_end: mouse_dd dd 0 ;--------------------------------------------------------------------- -check1 check_box 353,40,4,10,0x80FFFFFF,0,0,check_text,6 +check1 check_box 353,39,4,10,0x80FFFFFF,0,0,check_text,6 check1_end: check_text db 'Kernel',0 diff --git a/programs/other/kpack/trunk/kpack.asm b/programs/other/kpack/trunk/kpack.asm index 0f5c589e5c..59d2b2614f 100644 --- a/programs/other/kpack/trunk/kpack.asm +++ b/programs/other/kpack/trunk/kpack.asm @@ -69,11 +69,6 @@ load_libraries l_libs_start,load_lib_end movsw movsd ; get system window info - mcall 48,3,color_table,40 -;-------------------------------------- -edit_boxes_set_sys_color edit1,editboxes_end,color_table -check_boxes_set_sys_color check1,check1_end,color_table -;-------------------------------------- xor eax,eax cmp [params],al je default @@ -426,6 +421,11 @@ draw_messages: draw_window: ; start redraw mcall 12,1 + + mcall 48,3,color_table,40 +;-------------------------------------- +edit_boxes_set_sys_color edit1,editboxes_end,color_table +check_boxes_set_sys_color check1,check1_end,color_table ;-------------------------------------- ; define window xor eax,eax @@ -505,7 +505,7 @@ draw_lines: draw_buttons: ; define compress button mov cx,18 - mcall 8,<351,72>,,2,[color_table+24] + mcall 8,<351,72>,<1, 17>,2,[color_table+24] ; uncompress button add ecx,18 shl 16 inc edx @@ -543,8 +543,8 @@ draw_buttons: mcall ; text on compress and decompress buttons or ecx,80000000h - mcall ,<367,7>,,aCompress - mcall ,<359,25>,,aDecompress + mcall ,<364,6>,,aCompress + mcall ,<359,24>,,aDecompress ret ;********************************************************************* ;Pack procedures