Subversion Repositories Kolibri OS

Rev

Rev 1037 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1037 Rev 1041
Line 279... Line 279...
279 
sb_m_keys	equ [edi+64]
 279 
sb_m_keys		equ [edi+64]
280 
sb_run_size    equ [edi+68]
 280 
sb_run_size		equ [edi+68]
281 
sb_position2   equ [edi+72]
 281 
sb_position2	equ [edi+72]
282 
sb_work_size   equ [edi+76]
 282 
sb_work_size	equ [edi+76]
283 
sb_all_redraw  equ [edi+80]
 283 
sb_all_redraw	equ [edi+80]
- 
 
 284 
sb_ar_offset	equ [edi+84]
284 
}
 285 
}
285 
;*****************************************************************************
 286 
;*****************************************************************************
286 
;*****************************************************************************
 287 
;*****************************************************************************
287 
; draw event
 288 
; draw event
288 
;*****************************************************************************
 289 
;*****************************************************************************
Line 291... Line 292...
291 
{
 292 
{
292 
scroll_bar_vertical:
 293 
scroll_bar_vertical:
293 
.draw:
 294 
.draw:
294 
	pusha
 295 
	pusha
295 
	mov   edi,dword [esp+36]
 296 
	mov   edi,dword [esp+36]
296 
	mov   sb_all_redraw,dword 1
 297 
;	mov   sb_all_redraw,dword 1
- 
 
 298 
	mov   sb_delta,word 0
297 
	call  .draw_1
 299 
	call  .draw_1
298 
	mov   sb_all_redraw,dword 0
 300 
	mov   sb_all_redraw,dword 0
299 
scroll_bar_exit
 301 
scroll_bar_exit
300 
.draw_1:
 302 
.draw_1:
301 
	pusha
 303 
	pusha
Line 669... Line 671...
669 
	ja    .scroll_sb
 671 
	ja	.scroll_sb
Line 670... Line 672...
670
672
671 
	cmp   sb_m_keys,dword 0
 673 
	cmp   sb_m_keys,dword 0
Line -... Line 674...
- 
 
 674 
	je   .exit_sb
672 
	je   .exit_sb
 675
673
676 
	mov   eax,sb_ar_offset
674 
	cmp   sb_position,dword 0
 677 
	cmp   sb_position,eax  ;dword 0
Line 675... Line 678...
675 
;	je    .exit_sb
 678 
;	je	.exit_sb
- 
 
 679 
	jbe   @f
676 
	je   @f
 680
677
681 
;	dec   dword sb_position
- 
 
 682 
	sub   sb_position,eax
- 
 
 683 
	jmp   .all_sb
678 
	dec   dword sb_position
 684 
@@:
679 
	jmp   .all_sb
 685 
	xor   eax,eax
680 
@@:
 686 
	mov   sb_position,eax ;dword 0
681 
	mov   sb_position2,dword 0
 687 
	mov   sb_position2,eax ;dword 0
682 
	jmp   .all_sb
 688 
	jmp   .all_sb
683 
;*****************************************************************************
 689 
;*****************************************************************************
Line 782... Line 788...
782 
.down_sb:
 788 
.down_sb:
783 
	cmp   sb_m_keys,dword 0
 789 
	cmp   sb_m_keys,dword 0
784 
	je   .exit_sb
 790 
	je   .exit_sb
Line 785... Line 791...
785
791
- 
 
 792 
	mov   eax,sb_max_area
786 
	mov   eax,sb_max_area
 793 
	mov   ebx,sb_ar_offset
- 
 
 794 
	sub   eax,sb_cur_area
- 
 
 795 
	push  eax
787 
	sub   eax,sb_cur_area
 796 
	sub   eax,ebx
- 
 
 797 
	cmp   sb_position,eax
788 
	cmp   sb_position,eax
 798 
	pop   eax
789 
;	jae   .exit_sb
 799 
;	jae   .exit_sb
Line 790... Line 800...
790 
	jae   @f
 800 
	jae   @f
- 
 
 801
791
802 
;	inc   dword sb_position
792 
	inc   dword sb_position
 803 
	add   sb_position,ebx
- 
 
 804 
	jmp   .all_sb
793 
	jmp   .all_sb
 805 
@@:
794 
@@:
 806 
	mov   sb_position,eax
795 
	xor   eax,eax
 807 
	xor   eax,eax
796 
	mov   ax,sb_size_y
 808 
	mov   ax,sb_size_y
797 
	sub   eax,sb_btn_high
 809 
	sub   eax,sb_btn_high
Line 812... Line 824...
812 
{
 824 
{
813 
scroll_bar_horizontal:
 825 
scroll_bar_horizontal:
814 
.draw:
 826 
.draw:
815 
	pusha
 827 
	pusha
816 
	mov   edi,dword [esp+36]
 828 
	mov   edi,dword [esp+36]
817 
	mov   sb_all_redraw,dword 1
 829 
;	mov   sb_all_redraw,dword 1
- 
 
 830 
	mov   sb_delta,word 0
818 
	call  .draw_1
 831 
	call  .draw_1
819 
	mov   sb_all_redraw,dword 0
 832 
	mov   sb_all_redraw,dword 0
820 
scroll_bar_exit
 833 
scroll_bar_exit
821 
.draw_1:
 834 
.draw_1:
822 
	pusha
 835 
	pusha
Line 1191... Line 1204...
1191 
	ja    .scroll_sb
 1204 
	ja	.scroll_sb
Line 1192... Line 1205...
1192
1205
1193 
	cmp   sb_m_keys,dword 0
 1206 
	cmp   sb_m_keys,dword 0
Line -... Line 1207...
- 
 
 1207 
	je   .exit_sb
1194 
	je   .exit_sb
 1208
1195
1209 
	mov   eax,sb_ar_offset
1196 
	cmp   sb_position,dword 0
 1210 
	cmp   sb_position,eax  ;dword 0
Line 1197... Line 1211...
1197 
;	je    .exit_sb
 1211 
;	je	.exit_sb
- 
 
 1212 
	jbe   @f
1198 
	je   @f
 1213
1199
1214 
;	dec   dword sb_position
- 
 
 1215 
	sub   sb_position,eax
- 
 
 1216 
	jmp   .all_sb
1200 
	dec   dword sb_position
 1217 
@@:
1201 
	jmp   .all_sb
 1218 
	xor   eax,eax
1202 
@@:
 1219 
	mov   sb_position,eax ;dword 0
1203 
	mov   sb_position2,dword 0
 1220 
	mov   sb_position2,eax  ;dword 0
1204 
	jmp   .all_sb
 1221 
	jmp   .all_sb
1205 
;*****************************************************************************
 1222 
;*****************************************************************************
Line 1304... Line 1321...
1304 
.down_sb:
 1321 
.down_sb:
1305 
	cmp   sb_m_keys,dword 0
 1322 
	cmp   sb_m_keys,dword 0
1306 
	je   .exit_sb
 1323 
	je   .exit_sb
Line 1307... Line 1324...
1307
1324
- 
 
 1325 
	mov   eax,sb_max_area
1308 
	mov   eax,sb_max_area
 1326 
	mov   ebx,sb_ar_offset
- 
 
 1327 
	sub   eax,sb_cur_area
- 
 
 1328 
	push  eax
1309 
	sub   eax,sb_cur_area
 1329 
	sub   eax,ebx
- 
 
 1330 
	cmp   sb_position,eax
1310 
	cmp   sb_position,eax
 1331 
	pop   eax
1311 
;	jae   .exit_sb
 1332 
;	jae   .exit_sb
Line 1312... Line 1333...
1312 
	jae   @f
 1333 
	jae   @f
- 
 
 1334
1313
1335 
;	inc   dword sb_position
1314 
	inc   dword sb_position
 1336 
	add   sb_position,ebx
- 
 
 1337 
	jmp   .all_sb
1315 
	jmp   .all_sb
 1338 
@@:
1316 
@@:
 1339 
	mov   sb_position,eax
1317 
	xor   eax,eax
 1340 
	xor   eax,eax
1318 
	mov   ax,sb_size_x
 1341 
	mov   ax,sb_size_x
1319 
	sub   eax,sb_btn_high
 1342 
	sub   eax,sb_btn_high