Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2316 → Rev 2317

/programs/develop/libraries/box_lib/trunk/tree_list.mac
46,11 → 46,11
mov eax,tl_p_scrol
;*** öâåòîâûå íàñòðîéêè ***
mov ecx,tl_col_bkg
mov dword[eax+28],ecx ;+28 .bckg_col
mov dword[eax+sb_offs_bckg_col],ecx
mov ecx,tl_col_zag
mov dword[eax+32],ecx ;+32 .frnt_col
mov dword[eax+sb_offs_frnt_col],ecx
mov ecx,tl_col_txt
mov dword[eax+36],ecx ;+32 .line_col
mov dword[eax+sb_offs_line_col],ecx
;*** íàñòðîéêè ðàçìåðîâ ***
mov ecx,tl_box_left
add ecx,tl_box_width
107,7 → 107,7
cmp tl_p_scrol,0 ;îáðàáîòêà ñêðîëëèíãà
je @f
mov eax,tl_p_scrol
mov dword[eax+24],0 ;+24 .position
mov dword[eax+sb_offs_position],0
call tb_scrol_resize
@@:
pop edi ecx eax
324,19 → 324,19
cmp eax,ebx ;ïðàâàÿ ãðàíèöà îêíà
jg .no_in_wnd
 
mov eax,dword[edx+16] ;+16 .max_area
cmp eax,dword[edx+20] ;+20 .cur_area
mov eax,dword[edx+sb_offs_max_area]
cmp eax,dword[edx+sb_offs_cur_area]
jbe .no_in_wnd ;âñå óçëû ïîïàäàþò â îêíî ñêðîëëèíãà
push dword edx
call scroll_bar_vertical.mouse ;scrollbar_ver_mouse
 
cmp dword[edx+40],0 ;+40 .redraw
cmp dword[edx+sb_offs_redraw],0
je @f
mov dword[edx+40],0 ;+40 .redraw
mov dword[edx+sb_offs_redraw],0
push dword edi
call tl_draw ;ïðîèçîøëè èçìåíåíèÿ ñêðîëëèíãà
@@:
cmp dword[edx+46],0 ;+46 .delta2
cmp dword[edx+sb_offs_delta2],0
jne .no_draw ;ïîïàëè íà ñêðîëëèíã - íå ñíèìàåì ôîêóñ ñ TreeList
;-------------------------------------------------------------------------------
.no_in_wnd: ;íå ïîïàëè â îêíî - ïîòåðÿ ôîêóñà (ïðè óñëîâèè ÷òî ôîêóñ áûë íà äàííîì ýåëåìåíòå)
1396,8 → 1396,8
.ye_sb:
 
mov edx,tl_p_scrol
mov dword[edx+20],eax ;+20 .cur_area
mov dword[edx+16],ecx ;+16 .max_area
mov dword[edx+sb_offs_cur_area],eax
mov dword[edx+sb_offs_max_area],ecx
push dword edx ;pointer to scroll struct
call scroll_bar_vertical.draw
@@:
1658,10 → 1658,10
je @f
call tl_get_rows_count ;eax = rows count
mov ebx,tl_p_scrol
add eax,dword[ebx+24] ;.position +24
add eax,dword[ebx+sb_offs_position]
cmp tl_cur_pos,eax
jl @f
inc dword[ebx+24] ;.position +24
inc dword[ebx+sb_offs_position]
push dword ebx
call scroll_bar_vertical.draw
 
2169,7 → 2169,7
 
;copy scroll position
mov edx,tl_p_scrol
mov eax,dword[edx+24] ;+24 .position
mov eax,dword[edx+sb_offs_position]
mov dword[esi+22],eax
 
add esi,tl_save_load_heder_size ;add header size
2300,7 → 2300,7
mov ebx,tl_p_scrol
cmp ebx,0
je .end_f
mov dword[ebx+24],eax ;+24 .position
mov dword[ebx+sb_offs_position],eax
push dword ebx ;pointer to scroll struct
call scroll_bar_vertical.draw