~rabbits/turye

cca1787fde22628565c9fed395e81e06aa39e48e — Devine Lu Linvega 4 months ago f7a9754
Improved look of collection
1 files changed, 23 insertions(+), 22 deletions(-)

M src/turye.tal
M src/turye.tal => src/turye.tal +23 -22
@@ 514,15 514,6 @@
	#0a <draw-filepath>

@<draw-collection> ( -- )
	#15 .Screen/auto DEO
	.collection-view/y LDZ2 #0010 SUB2 .Screen/y DEO2
	#0000
	&loop ( -- )
		#00 OVR #0f AND #40 SFT2 .collection-view/x LDZ2 ADD2 .Screen/x DEO2
		#00 OVR #04 SFT #40 SFT2 .collection-view/y LDZ2 ADD2 .Screen/y DEO2
		DUP <draw-collection>/item
		INC NEQk ?&loop
	POP2
	( | grid )
	[ LIT2 00 -Screen/auto ] DEO
	#2000


@@ 532,21 523,29 @@
	&h ( -- )
		DUP STHkr get-grid .Screen/addr DEO2
		#00 OVR #30 SFT .collection-view/x LDZ2 ADD2 .Screen/x DEO2
		[ LIT2 0a -Screen/sprite ] DEO
		[ LIT2 0c -Screen/sprite ] DEO
		INC GTHk ?&h
	POP2 POPr INC GTHk ?&v
	POP2
	( | items )
	[ LIT2 15 -Screen/auto ] DEO
	.collection-view/y LDZ2 #0010 SUB2 .Screen/y DEO2
	#0000
	&loop ( -- )
		#00 OVR DUP2 #0f AND #40 SFT2 .collection-view/x LDZ2 ADD2 .Screen/x DEO2
		#04 SFT #40 SFT2 .collection-view/y LDZ2 ADD2 .Screen/y DEO2
		DUP <draw-collection>/item
		INC NEQk ?&loop
	POP2 JMP2r
	&item ( byte -- )
		#00 OVR ;font ADD2 LDA ?&has-width
		;empty-icn .Screen/addr DEO2
		.glyph LDZ EQU STH
		#060c STHr JMP
		SWP POP .Screen/sprite DEOk DEO
		JMP2r
		&has-width DUP get-addr .Screen/addr DEO2
		#00 OVR ;font ADD2 LDA ?{
			;empty-icn .Screen/addr DEO2
			.glyph LDZ EQU STH
			#0500 STHr [ JMP SWP POP ] .Screen/sprite DEOk DEO
			JMP2r }
		DUP get-addr .Screen/addr DEO2
		.glyph LDZ EQU STH
		#060e STHr JMP
		SWP POP .Screen/sprite DEOk DEO
		#050a STHr [ JMP SWP POP ] .Screen/sprite DEOk DEO
		JMP2r

@get-grid ( x y -- addr* )


@@ 833,9 832,7 @@
@special-chr [
	007e 425a 5a42 7e00 ffff ffff ffff ffff ]

@empty-icn [
	003f 4040 4040 4040 4040 4040 403f 0000
	00f8 0404 0404 0404 0404 0404 04f8 0000 ]


@brush-icn [ 0070 6844 2211 0906 ]



@@ 847,6 844,10 @@

@scrollbar-icn &bg [ aa55 aa55 aa55 aa55 ] &fg [ ffff ffff ffff ffff ] &v-arrow [ 0018 3c7e 1818 1800 ] &h-arrow [ 0010 307e 7e30 1000 ]

@empty-icn [
	8040 2010 0804 0201 0102 0408 1020 4080
	0102 0408 1020 4080 8040 2010 0804 0201 ]

@grid-icn [
	0000 0000 0000 0000 0100 0100 0100 0100
	0000 0000 0000 00aa 0100 0100 0100 01aa ]