Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1040 → Rev 1041

/programs/develop/libraries/box_lib/trunk/scrollbar.mac
281,6 → 281,7
sb_position2 equ [edi+72]
sb_work_size equ [edi+76]
sb_all_redraw equ [edi+80]
sb_ar_offset equ [edi+84]
}
;*****************************************************************************
;*****************************************************************************
293,7 → 294,8
.draw:
pusha
mov edi,dword [esp+36]
mov sb_all_redraw,dword 1
; mov sb_all_redraw,dword 1
mov sb_delta,word 0
call .draw_1
mov sb_all_redraw,dword 0
scroll_bar_exit
671,14 → 673,18
cmp sb_m_keys,dword 0
je .exit_sb
cmp sb_position,dword 0
mov eax,sb_ar_offset
cmp sb_position,eax ;dword 0
; je .exit_sb
je @f
jbe @f
dec dword sb_position
; dec dword sb_position
sub sb_position,eax
jmp .all_sb
@@:
mov sb_position2,dword 0
xor eax,eax
mov sb_position,eax ;dword 0
mov sb_position2,eax ;dword 0
jmp .all_sb
;*****************************************************************************
.scroll_sb:
784,14 → 790,20
je .exit_sb
mov eax,sb_max_area
mov ebx,sb_ar_offset
sub eax,sb_cur_area
push eax
sub eax,ebx
cmp sb_position,eax
pop eax
; jae .exit_sb
jae @f
inc dword sb_position
; inc dword sb_position
add sb_position,ebx
jmp .all_sb
@@:
mov sb_position,eax
xor eax,eax
mov ax,sb_size_y
sub eax,sb_btn_high
814,7 → 826,8
.draw:
pusha
mov edi,dword [esp+36]
mov sb_all_redraw,dword 1
; mov sb_all_redraw,dword 1
mov sb_delta,word 0
call .draw_1
mov sb_all_redraw,dword 0
scroll_bar_exit
1193,14 → 1206,18
cmp sb_m_keys,dword 0
je .exit_sb
cmp sb_position,dword 0
mov eax,sb_ar_offset
cmp sb_position,eax ;dword 0
; je .exit_sb
je @f
jbe @f
dec dword sb_position
; dec dword sb_position
sub sb_position,eax
jmp .all_sb
@@:
mov sb_position2,dword 0
xor eax,eax
mov sb_position,eax ;dword 0
mov sb_position2,eax ;dword 0
jmp .all_sb
;*****************************************************************************
.scroll_sb:
1306,14 → 1323,20
je .exit_sb
mov eax,sb_max_area
mov ebx,sb_ar_offset
sub eax,sb_cur_area
push eax
sub eax,ebx
cmp sb_position,eax
pop eax
; jae .exit_sb
jae @f
inc dword sb_position
; inc dword sb_position
add sb_position,ebx
jmp .all_sb
@@:
mov sb_position,eax
xor eax,eax
mov ax,sb_size_x
sub eax,sb_btn_high