From d74e4dd0688428d0a8aead78e0b76fdbefebecb7 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 23 Mar 2016 13:24:22 +0000 Subject: [PATCH] Animage 1.51: update toolbar icons, pencil cursor TODO: fix zoom buttons position git-svn-id: svn://kolibrios.org@6367 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/media/animage/trunk/animage.asm | 8 ++++---- .../media/animage/trunk/events_of_window.inc | 12 +++++++++++- .../media/animage/trunk/panel_buttons.png | Bin 3514 -> 1324 bytes programs/media/animage/trunk/panel_data.inc | 2 +- programs/media/animage/trunk/pencil.cur | Bin 766 -> 766 bytes 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/programs/media/animage/trunk/animage.asm b/programs/media/animage/trunk/animage.asm index 95cc92ad60..029e04f607 100644 --- a/programs/media/animage/trunk/animage.asm +++ b/programs/media/animage/trunk/animage.asm @@ -1,10 +1,10 @@ ;******************************************************* ;**************GRAPHICS EDITOR ANIMAGE ***************** ;******************************************************* -; version: 1.5 -; last update: 21.03.2016 -; changes: Use library 'kmenu.obj' -; autors: IgorA, Veliant +; version: 1.51 +; last update: 23.03.2016 +; changes: Use library 'kmenu.obj', update GUI +; autors: IgorA, Veliant, Leency ;-------------------------------------------------------- ; version: 1.4 ; last update: 12.03.2016 diff --git a/programs/media/animage/trunk/events_of_window.inc b/programs/media/animage/trunk/events_of_window.inc index 9a6c5d70eb..03ee0da710 100644 --- a/programs/media/animage/trunk/events_of_window.inc +++ b/programs/media/animage/trunk/events_of_window.inc @@ -64,13 +64,23 @@ no_znak2: call put_main_menu ;------------------------------------------------ + ; draw toolbard background + mov ebx, ci_panel_x_pos + shl ebx, 16 + add ebx, [Window_SizeX] + sub ebx, 9 + mov ecx, ci_panel_y_pos + shl ecx, 16 + add ecx, 51 + mov edx, 0xD5CDCB + mcall 13 + mov eax,ci_panel_x_pos mov ebx,ci_panel_y_pos mov ecx,[Window_SizeX] mov edx,50 mov esi,1 sub ecx,5+ci_panel_x_pos+ci_offs_skin_w - call draw_volume_rectangle ; tools panel call draw_icons call PrintMousePos ;------------------------------------------------ diff --git a/programs/media/animage/trunk/panel_buttons.png b/programs/media/animage/trunk/panel_buttons.png index b693fe38462d1a5a8642c41b2c62698feedee352..79e0c72b6595a81d9cec471c42d011d096506dfc 100644 GIT binary patch delta 1305 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 YW#*a}@PbVv|4hmz1{V5tx_4v$17dgTMgRZ+ diff --git a/programs/media/animage/trunk/panel_data.inc b/programs/media/animage/trunk/panel_data.inc index 7de0ee6591..6aaaa71d95 100644 --- a/programs/media/animage/trunk/panel_data.inc +++ b/programs/media/animage/trunk/panel_data.inc @@ -1,7 +1,7 @@ ;********************************************************** ;------------------TEXT DATA------------------------------- ;********************************************************** -name_of_program db 'ANIMAGE graphics editor v1.5',0 +name_of_program db 'ANIMAGE graphics editor v1.51',0 mouse_pos_x db 'X=' mouse_pos_y db 'Y=' new_text1 db 'PICTURE SIZE X' diff --git a/programs/media/animage/trunk/pencil.cur b/programs/media/animage/trunk/pencil.cur index 9fcd5e27a07026fb40a7890f0b8f30b2979baa2b..eb1ba5f468761306c0568c66b4dc57376240eb73 100644 GIT binary patch literal 766 zcmdUtI}XAy5JV?YB+?~S+PLHva3pTPN)%knh>OrcNtpt%JO@Q0ZqkOa-+nw>Y+hvf@l(rCH4}~hCWO$R>sTi|iQkZ=ckrGTXMhqXX+*1Xd^pwIs=rCWhKF@m% r*+8>~fo!L2<+Zf@fo1iKG_ZjaT;K-Jqx-OPfA#L~-+?RU9hUV0>bRJY literal 766 zcmd6lF%H5o3`Ktn5_C!@RyuMExEVP@R&En+g2cku4F-h!QdEgVLX5@9b8P=Vc!*T1 zQrERwYol8&vb2K^4p3=HmOR=N?Np4fN2Kun{g5faE5?Xm