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 ac2aa66271..1e4c9809f0 100644 Binary files a/programs/develop/info3ds/toolbar.png and b/programs/develop/info3ds/toolbar.png differ