From 2d1b4b26705cd2e6fa5c4f679620527b51b770a6 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Fri, 30 Aug 2024 13:30:44 -0700
Subject: [PATCH] (m291) Progress on merging lists

---
 gui/m291/src/m291.tal | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal
index 199012c..f01e107 100644
--- a/gui/m291/src/m291.tal
+++ b/gui/m291/src/m291.tal
@@ -323,20 +323,7 @@
 
 @<y-id> ( y* -- id )
 	[ LIT2 00 -playing ] LDZ EQU ?{ #0080 SUB2 }
-	#0018 SUB2
-	( | above )
-	DUP2 #8000 GTH2 ?&outside
-	( | spacer )
-	has-spacer #00 EQU ?{
-		DUP2 [ LIT2 00 -lines/folders ] LDZ #40 SFT2 SUB2 #0008 LTH2 ?&outside
-		DUP2 [ LIT2 00 -lines/folders ] LDZ #40 SFT2 GTH2 #00 SWP #30 SFT2 SUB2 }
-	#04 SFT2 NIP
-	( | below )
-	DUP count-lines LTH ?{ POP #ff }
-	JMP2r
-
-	&outside ( y* -- id )
-	POP2 #ff JMP2r
+	#0018 SUB2 #04 SFT2 NIP .selection/scroll LDZ ADD JMP2r
 
 @<refresh-dir> ( -- )
 	;path .File/name DEO2
@@ -359,7 +346,6 @@
 	( tracks ) .lines/tracks LDZ ADD
 	( scroll ) #18 LTHk [ JMP SWP ] POP
 	( empty ) DUP #00 EQU ADD #40 SFT2
-	( no-folder spacer ) has-spacer #00 EQU ?{ #0008 ADD2 }
 	( padding ) #0020 ADD2
 	( playing ) [ LIT2 00 -playing ] LDZ EQU ?{ #0080 ADD2 }
 	.Screen/height DEO2
@@ -436,10 +422,6 @@
 @count-lines ( -- lines )
 	.lines/folders LDZ .lines/tracks LDZ ADD JMP2r
 
-@has-spacer ( -- f )
-	[ LIT2 00 -lines/folders ] LDZ NEQ
-	( .. ) [ LIT2 00 -lines/tracks ] LDZ NEQ AND JMP2r
-
 @is-folder ( line* -- line* f )
 	DUP2 lcap/ #0001 SUB2 LDA [ LIT "/ ] EQU JMP2r
 
@@ -535,7 +517,6 @@
 		;dict/empty #0f !<draw-uf2> }
 	( | folders )
 	.selection LDZ <draw-folders>
-	has-spacer #00 EQU ?{ ;dash-icn <draw-spacer> }
 	;mem/tracks .lines/tracks LDZ .selection LDZ .lines/folders LDZ SUB
 	( >> )