KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

fix startup instrument in 6364

Browse Source 
git-svn-id: svn://kolibrios.org@6365 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2016-03-23 10:52:58 +00:00
parent ccef80df60
commit 287dc2ef20
2 changed files with 7 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/media/animage/trunk/animage.asm
View File

@ -106,6 +106,8 @@ include 'init_data.inc'
;--------get memory and draw window of program-------------
;----------------------------------------------------------
call GetMemory
mov [Current_instrument],10 ;pencil
call TakeButtonInstruments ;set startup instrument
call cleare_work_arrea
call load_icons
call init_main_menu
@ -114,7 +116,6 @@ include 'init_data.inc'
mov eax,CursorsID
call load_cursors
call drawwin
;---------------------------------------------------------
;---------check loading of file from parameters-----------
;---------------------------------------------------------
@ -139,8 +140,6 @@ include 'init_data.inc'
;OpenDialog initialisation
stdcall [OpenDialog_Init], OpenDialog_data
;---------------------------------------------------------------------
mov [Current_instrument],10 ;pencil
call TakeButtonInstruments ;set startup instrument
align 4
red:
@ -283,8 +282,6 @@ Icon_X rd 1
Icon_Y rd 1
counter rd 1
counter2 rd 1
menu_counter rd 1
counter_11 rd 1
number_panel rd 1
number_menu rd 1

62
programs/media/animage/trunk/panel_engen.inc
View File

@ -1,65 +1,3 @@
;---------------------------------------------------------
;-----draw panel menu(main engin of panel)----------------
;---------------------------------------------------------
print_panel_menu:
;delit main buttons(some time)
mov [counter],10
next_icon_delit1:
mov edx,[counter]
add edx,11100000000000000000000000000000b
mcall SF_DEFINE_BUTTON
inc [counter]
cmp [counter],30
jl next_icon_delit1
;delit buttons of brushes
mov [counter],40
next_icon_delit2:
mov edx,[counter]
add edx,11100000000000000000000000000000b
mcall SF_DEFINE_BUTTON
inc [counter]
cmp [counter],45
jl next_icon_delit2
;delit buttons of zoom
mov [counter],45
next_icon_delit3:
mov edx,[counter]
add edx,11100000000000000000000000000000b
mcall SF_DEFINE_BUTTON
inc [counter]
cmp [counter],50
jl next_icon_delit3
;delit buttons of palette
mov edx,51
add edx,11100000000000000000000000000000b
mcall SF_DEFINE_BUTTON
;delit buttons of color
mov edx,52
add edx,11100000000000000000000000000000b
mcall SF_DEFINE_BUTTON
call GetMouseCoordinats
and [menu_counter],0
and [counter_11],0
mcall SF_SLEEP,15
pusha
call drawwin
popa
mov [number_panel],0
jmp TakeInstruments
;---------------------------------------------------------
;------print mouse position on panel----------------------
;---------------------------------------------------------