From 14963ad6d15994058305f2d4f0ee6d842c969126 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 2 Feb 2016 15:05:58 +0000 Subject: [PATCH] info3ds: better icons git-svn-id: svn://kolibrios.org@6130 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/info3ds/info3ds.asm | 22 +++++++------- programs/develop/info3ds/info3ds_u.asm | 30 +++++++++---------- programs/develop/info3ds/info_wnd_coords.inc | 8 ++--- programs/develop/info3ds/toolbar.png | Bin 2997 -> 2675 bytes 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/programs/develop/info3ds/info3ds.asm b/programs/develop/info3ds/info3ds.asm index ae04091845..7c5b010fbd 100644 --- a/programs/develop/info3ds/info3ds.asm +++ b/programs/develop/info3ds/info3ds.asm @@ -49,7 +49,7 @@ open_b rb 560 ; main_wnd_height equ 460 ;высота главного окна программы fn_toolbar db 'toolbar.png',0 -IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3 +IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3 IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*12+54 image_data_toolbar dd 0 ; @@ -457,36 +457,36 @@ pushad mov word[buf_0.l],ax mov esi,[sc.work_button] - mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,3 - mcall ,(30 shl 16)+20,,4 + mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,0x40000003 + mcall ,(30 shl 16)+20,,0x40000004 cmp byte[can_save],0 je @f - mcall ,(55 shl 16)+20,,5 + mcall ,(55 shl 16)+20,,0x40000005 @@: - mcall ,(85 shl 16)+20,,6 ;окно с координатами - mcall ,(110 shl 16)+20,,7 ;удаление блока + mcall ,(85 shl 16)+20,,0x40000006 ;окно с координатами + mcall ,(110 shl 16)+20,,0x40000007 ;удаление блока - mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+7 ;new + mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+5 ;new add ebx,IMAGE_TOOLBAR_ICON_SIZE - mov edx,(32 shl 16)+7 ;open + mov edx,(30 shl 16)+5 ;open int 0x40 cmp byte[can_save],0 je @f add ebx,IMAGE_TOOLBAR_ICON_SIZE - mov edx,(57 shl 16)+7 ;save + mov edx,(55 shl 16)+5 ;save int 0x40 sub ebx,IMAGE_TOOLBAR_ICON_SIZE @@: add ebx,4*IMAGE_TOOLBAR_ICON_SIZE - mov edx,(87 shl 16)+7 + mov edx,(85 shl 16)+5 int 0x40 add ebx,IMAGE_TOOLBAR_ICON_SIZE - mov edx,(112 shl 16)+7 + mov edx,(110 shl 16)+5 int 0x40 mov dword[w_scr_t1.all_redraw],1 diff --git a/programs/develop/info3ds/info3ds_u.asm b/programs/develop/info3ds/info3ds_u.asm index cb61cc7d43..138ed95607 100644 --- a/programs/develop/info3ds/info3ds_u.asm +++ b/programs/develop/info3ds/info3ds_u.asm @@ -54,7 +54,7 @@ open_b rb 560 ; main_wnd_height equ 460 ;высота главного окна программы fn_toolbar db 'toolbar.png',0 -IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3 +IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3 IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*12+54 image_data_toolbar dd 0 ; @@ -491,27 +491,27 @@ pushad stdcall [kmainmenu_draw], [main_menu] mov esi,[sc.work_button] - mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(24 shl 16)+20,3 - mcall ,(30 shl 16)+20,,4 ;open - mcall ,(3d_wnd_l shl 16)+20,,5 ;вершины вкл./выкл. - mcall ,((3d_wnd_l+25) shl 16)+20,,6 ;грани вкл./выкл. - mcall ,((3d_wnd_l+50) shl 16)+20,,7 ;заливка граней вкл./выкл. - mcall ,((3d_wnd_l+75) shl 16)+20,,8 ;свет вкл./выкл. - mcall ,((3d_wnd_l+100) shl 16)+20,,9 ;сброс + mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(24 shl 16)+20,0x40000003 + mcall ,(30 shl 16)+20,,0x40000004 ;open + mcall ,(3d_wnd_l shl 16)+20,,0x40000005 ;вершины вкл./выкл. + mcall ,((3d_wnd_l+25) shl 16)+20,,0x40000006 ;грани вкл./выкл. + mcall ,((3d_wnd_l+50) shl 16)+20,,0x40000007 ;заливка граней вкл./выкл. + mcall ,((3d_wnd_l+75) shl 16)+20,,0x40000008 ;свет вкл./выкл. + mcall ,((3d_wnd_l+100) shl 16)+20,,0x40000009 ;сброс - mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+26 ;new + mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+24 ;new add ebx,IMAGE_TOOLBAR_ICON_SIZE - mcall ,,,(32 shl 16)+26 ;open + mcall ,,,(30 shl 16)+24 ;open add ebx,IMAGE_TOOLBAR_ICON_SIZE*6 - mcall ,,,((3d_wnd_l+2) shl 16)+26 ;вершины вкл./выкл. + mcall ,,,((3d_wnd_l) shl 16)+24 ;вершины вкл./выкл. add ebx,IMAGE_TOOLBAR_ICON_SIZE - mcall ,,,((3d_wnd_l+27) shl 16)+26 ;грани вкл./выкл. + mcall ,,,((3d_wnd_l+25) shl 16)+24 ;грани вкл./выкл. add ebx,IMAGE_TOOLBAR_ICON_SIZE - mcall ,,,((3d_wnd_l+52) shl 16)+26 ;заливка граней вкл./выкл. + mcall ,,,((3d_wnd_l+50) shl 16)+24 ;заливка граней вкл./выкл. add ebx,IMAGE_TOOLBAR_ICON_SIZE - mcall ,,,((3d_wnd_l+77) shl 16)+26 ;свет вкл./выкл. + mcall ,,,((3d_wnd_l+75) shl 16)+24 ;свет вкл./выкл. add ebx,IMAGE_TOOLBAR_ICON_SIZE - mcall ,,,((3d_wnd_l+102) shl 16)+26 ;сброс + mcall ,,,((3d_wnd_l+100) shl 16)+24 ;сброс mov dword[w_scr_t1.all_redraw],1 stdcall [tl_draw], tree1 diff --git a/programs/develop/info3ds/info_wnd_coords.inc b/programs/develop/info3ds/info_wnd_coords.inc index b70f1fd21f..d553efd271 100644 --- a/programs/develop/info3ds/info_wnd_coords.inc +++ b/programs/develop/info3ds/info_wnd_coords.inc @@ -213,15 +213,15 @@ pushad int 0x40 mov esi,[sc.work_button] - mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (266 shl 16)+20, 3 - mcall , (30 shl 16)+20, (266 shl 16)+20, 4 + mcall SF_DEFINE_BUTTON, (5 shl 16)+20, (266 shl 16)+20, 0x40000003 + mcall , (30 shl 16)+20, (266 shl 16)+20, 0x40000004 mov ebx,[image_data_toolbar] add ebx,3*IMAGE_TOOLBAR_ICON_SIZE - mcall SF_PUT_IMAGE, , (16 shl 16)+16, (7 shl 16)+268 ;load + mcall SF_PUT_IMAGE, , (21 shl 16)+21, (5 shl 16)+266 ;load sub ebx,IMAGE_TOOLBAR_ICON_SIZE - mov edx,(32 shl 16)+268 ;save + mov edx,(30 shl 16)+266 ;save int 0x40 mov dword[w_scr_t3.all_redraw],1 diff --git a/programs/develop/info3ds/toolbar.png b/programs/develop/info3ds/toolbar.png index ac2aa66271395697fb59baa45196edf3ce1fd379..1e4c9809f06190efd3f40ef2406523bf693f139e 100644 GIT binary patch literal 2675 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