Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4027 → Rev 4026

/programs/system/icon_new/@icon.asm
124,9 → 124,9
@@:
;######################################################################
 
call FillIconsOffs ;§ ¯®«­ï¥â MaxNumIcon,IconsOffs
call FillIconsOffs
 
mcall 40,0100000b ;­ã¦­ë ⮫쪮 ᮡëâ¨ï ¬ëè¨, ¯¥à¥à¨á®¢ª  ¨ª®­®ª ¡ã¤¥â ¢ ¤à㣮¬ ¯®â®ª¥
mcall 40,0100000b
 
mov eax,[icon_count]
mov bl,ICONS_DRAW_COUNTH
138,7 → 138,7
and eax,0FFh
mov [sbIcons.max_area],eax
 
mcall 51,1,BGRedrawThread,stack_bredraw ;§ ¯ã᪠¥¬ ¯®â®ª ¯¥à¥à¨á®¢ª¨ ¨ª®­®ª
mcall 51,1,BGRedrawThread,stack_bredraw
stdcall [OpenDialog_Init],OpenDialog_data
 
messages:
339,7 → 339,7
;qweqwe:
 
mov [MovingActiv],1
mcall 51,1,MovingWnd,stack_mov ;CreateThread MovingWnd,stack_dlg
mcall 51,1,MovingWnd,stack_dlg ;CreateThread MovingWnd,stack_dlg
.WaitLB:
mcall 37,2 ;GetMouseKey
test al,001b
1149,6 → 1149,7
 
bFixIcons dd 1
bNotSave dd 0
bIcoBuff dd 0 ;1, ¥á«¨ IconArea § ­ïâ
 
LButtonActiv dd 0
RButtonActiv dd 0
1366,9 → 1367,8
IconArea rb 4*ICON_SIZE*ICON_SIZE
;\
 
sc system_colors
 
align 4
 
ScreenX rw 1
ScreenY rw 1
 
1383,11 → 1383,10
SelIcon rd 1
DlgSelIcon rd 1
slotDlgAdd rd 1
DlgBufImg rb IMG_SIZE*IMG_SIZE*3
 
sc system_colors
 
 
 
align 4
bufStdIco rb 40
IconsOffs rd 100
PIcoDB rd 1
1425,13 → 1424,12
temp_dir_pach rb 1024
fname_Info rb 1024
;-------------------------------------------------------------------------------
rb 512
stack_mov:
rb 512
rb 1024
stack_dlg:
rb 512
align 4
rb 1024
stack_bredraw:
rb 512
rb 1024
stack_area:
;------------------------------------------------------------------------------
ENDMEM:
/programs/system/icon_new/DlgAdd.inc
474,6 → 474,15
IcoY:DWORD,\
iIcon:DWORD
 
@@: ;¦¤ñ¬, ª®£¤  ®á¢®¡®¤¨âáï ¡ãää¥à
cmp [bIcoBuff],1
jne @f
mcall 5,1
jmp @b
@@:
 
mov [bIcoBuff],1 ;¡«®ª¨à㥬 IconArea
 
mov ecx,[sbIcons.position]
xor eax,eax
m2m dword[iIcon],0
501,7 → 510,7
.DrawIcoStolb:
push ecx
 
mov edi,DlgBufImg
mov edi,IconArea
mov edx,IMG_SIZE
 
.DrawLine:
529,7 → 538,7
mov edx,[IcoX]
shl edx,16
mov dx,word[IcoY]
mcall 7,DlgBufImg,<IMG_SIZE,IMG_SIZE>
mcall 7,IconArea,<IMG_SIZE,IMG_SIZE>
 
inc [iIcon]
mov eax,[iIcon]
548,7 → 557,7
.endDrawIcon:
 
mov ecx,IMG_SIZE*IMG_SIZE
mov edi,DlgBufImg
mov edi,IconArea
mov eax,[sc.work]
mov ebx,eax
shr ebx,16
572,7 → 581,7
mov edx,[IcoX]
shl edx,16
mov dx,word[IcoY]
mcall 7,DlgBufImg,<IMG_SIZE,IMG_SIZE>
mcall 7,IconArea,<IMG_SIZE,IMG_SIZE>
 
.Dalee:
add dword[IcoY],IMG_SIZE+SPCH
585,6 → 594,7
 
.endProc:
 
mov [bIcoBuff],0 ;à §¡«®ª¨à㥬 ¡ãä¥à
ret
endp
 
631,7 → 641,7
add esi,[raw_pointer]
add esi,44
 
mov edi,DlgBufImg
mov edi,IconArea
mov edx,IMG_SIZE
.DrawLine:
 
654,7 → 664,7
dec edx
jnz .DrawLine
 
mcall 7,DlgBufImg,<IMG_SIZE,IMG_SIZE>,<15,15>
mcall 7,IconArea,<IMG_SIZE,IMG_SIZE>,<15,15>
 
ret
endp
/programs/system/icon_new/bgredraw.inc
3,6 → 3,15
mcall 40,010000b
 
BGRTRedrawIcons:
@@:
cmp [bIcoBuff],1 ;¤«ï ¡«®ª¨à®¢ª¨ ¯à¥à¥à¨á®¢ª¨ ¨ª®­®ª
jne @f
mcall 5,1
jmp @b
@@:
 
mov [bIcoBuff],1
 
mcall 48,5
mov dx,ax
shr eax,16
27,6 → 36,9
loop @b
.NoDraw:
 
mov [bIcoBuff],0
 
 
BGRTmessages:
mcall 10
sub eax,5