Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6351 → Rev 6352

/programs/media/animage/trunk/animage.asm
88,8 → 88,6
jz @f
call load_picture
call MovePictureToWorkScreen
mov [Scroll1CoordinatX],9
mov [Scroll2CoordinatY],89
@@:
 
;---------------------------------------------------------------------
206,8 → 204,8
;------------variables and data of program------------------
;-----------------------------------------------------------
time rd 1
PosX rd 1
PosY rd 1
PosX rd 1 ;scroll x file position
PosY rd 1 ;scroll y file position
PointerToIcons rd 1
ScreenPointer rd 1
PointerToPicture rd 1
215,7 → 213,7
PointerToCopyPicture2 rd 1
PointerToEditBufer rd 1
PointerToSpriteBufer rd 1
PointerToPalette rd 1
PointerToPalette rd 1 ;㪠§ â¥«ì ­  ¯¨«¨âàã (­ã¦¥­ ¤«ï á®åà ­¥­¨ï ¢ *.bmp)
Color rd 1
Number_Brush rd 1
Brush_SizeX rd 1
235,13 → 233,13
Window_CordinatY rd 1
Picture_SizeX rd 1
Picture_SizeY rd 1
ScreenX rd 1
ScreenY rd 1
ScreenX rd 1 ;ª®®à¤¨­ â  x ªãàá®à  á ãç¥â®¬ ¬ áèâ ¡ 
ScreenY rd 1 ;ª®®à¤¨­ â  y ªãàá®à  á ãç¥â®¬ ¬ áèâ ¡ 
WorkScreen_SizeX rd 1
WorkScreen_SizeY rd 1
MaxWorkScreen_SizeX rd 1
MaxWorkScreen_SizeY rd 1
k rd 1
k rd 1 ;¬ áèâ ¡
 
ReserveArray rd 1
register rd 1
266,8 → 264,8
number_panel rd 1
number_menu rd 1
 
Scroll1CoordinatX rd 1
Scroll1CoordinatY rd 1
Scroll1CoordinatX rd 1 ;scroll x screen position
Scroll1CoordinatY rd 1 ;scroll y screen position
Scroll1MaxSizeX rd 1
Scroll1MaxSizeY rd 1
Scroll1SizeX rd 1
/programs/media/animage/trunk/events_of_window.inc
3,7 → 3,7
;----------------------------------------------------------
drawwin:
or ecx,-1
mcall 9,procinfo
mcall SF_THREAD_INFO,procinfo
mov esi,procinfo
 
mov eax,[esi+34]
47,7 → 47,7
 
no_znak2:
 
mcall 12,1
mcall SF_REDRAW,SSF_BEGIN_DRAW
;------------------------------------------------
mov ebx,50 ;[Window_CordinatX]
mov ecx,50 ;[Window_CordinatY]
55,9 → 55,7
shl ecx,16
add ebx,[Window_SizeX]
add ecx,[Window_SizeY]
;xor esi,esi ;0x805080d0
; xor edi,edi ;0x005080d0
mcall 0,,,0x53aabbcc,,name_of_program
mcall SF_CREATE_WINDOW,,,0x53aabbcc,,name_of_program
mov eax,[procinfo+70] ;staus of window
test eax,100b
87,8 → 85,6
call PrintMousePos
;------------------------------------------------
mov ecx,[k]
and [PosX],0
and [PosY],0
call MovePictureToWorkScreen
;------------------------------------------------
mov ebx,[WorkScreen_SizeX]
108,7 → 104,7
shl ecx,16
mov cx,dx
 
mcall 13,,,0xc7cbcf
mcall SF_DRAW_RECT,,,0xc7cbcf
;------------------------------------------------
mcall ,<5,3>
;------------------------------------------------
129,7 → 125,7
shl ecx,16
mov cx,dx
 
mcall 13,,,0xc7cbcf
mcall SF_DRAW_RECT,,,0xc7cbcf
;------------------------------------------------
mcall ,,<20+15+1+49+2,3>
;------------------------------------------------
168,6 → 164,6
call draw_volume_rectangle ; down and right small area
;------------------------------------------------
.end:
mcall 12,2
mcall SF_REDRAW,SSF_END_DRAW
ret
;-----------------------------------------------------------------------------
/programs/media/animage/trunk/icons_instruments.inc
109,8 → 109,8
 
no_activated_later:
 
mov eax,[MaxWorkScreen_SizeX]
mov ebx,[MaxWorkScreen_SizeY]
; mov eax,[MaxWorkScreen_SizeX] ???
; mov ebx,[MaxWorkScreen_SizeY] ???
 
mov eax,[PointerToPicture]
mov ebx,[ReserveArray]
/programs/media/animage/trunk/init_data.inc
1,8 → 1,6
;---------------------------------------------------------
;--------initializate data and params of program----------
;---------------------------------------------------------
mov [Scroll1CoordinatX],8+1
mov [Scroll2CoordinatY],20+15+1+50+3
mov [Window_SizeX],640
mov [Window_SizeY],220
mov [Window_CordinatX],50
/programs/media/animage/trunk/memory.inc
59,5 → 59,11
add eax,mem_screen+mem_panel_b
mov [PointerToPalette],eax
mov [ReserveArray],eax
 
;®¡­ã«¥­¨¥ áªà®««¨­£ 
and [PosX],0
and [PosY],0
mov [Scroll1CoordinatX],9 ;8+1
mov [Scroll2CoordinatY],89 ;20+15+1+50+3
ret
;---------------------------------------------------------
/programs/media/animage/trunk/menu_instruments.inc
168,8 → 168,6
call load_picture
call drawwin
 
mov [Scroll1CoordinatX],9
mov [Scroll2CoordinatY],89
and [number_panel],0
and [number_menu],0
jmp still