Fix scroll selection of floor items and buttons

src/Dodge/Render/List.hs

@@ -12,7 +12,7 @@ import Dodge.Data.SelectionList
 import Geometry
 import ListHelp
 import Picture
---import LensHelp
+import LensHelp
 
 drawSelectionList :: ListDisplayParams -> Configuration -> SelectionList a -> Picture
 drawSelectionList ldps cfig sl =
@@ -32,9 +32,10 @@ makeSelectionListPictures sl = concatMap _siPictures $ _slItems sl
 --    SelectionSizeRestriction {} -> concatMap (_siPictures . fst) $ _slShownItems sl
 --    _ -> concatMap _siPictures $ _slItems sl
 
-drawSelectionCursor :: ListDisplayParams -> Configuration -> SelectionList a -> Picture
-drawSelectionCursor ldps cfig sl = fromMaybe mempty $ do
-    i <- _slSelPos sl
+
+drawCursorAt :: ListDisplayParams -> Configuration -> Maybe Int -> [SelectionItem a] -> Picture
+drawCursorAt ldps cfig mi lis = fromMaybe mempty $ do
+    i <- mi
     selit <- lis !? i
     f <- case _ldpCursorType ldps of
         BorderCursor cps -> Just $ listCursorChooseBorderScale (_ldpVerticalGap ldps) (_ldpScale ldps) cps
@@ -43,11 +44,13 @@ drawSelectionCursor ldps cfig sl = fromMaybe mempty $ do
         col = _siColor selit
     return $ f (_ldpPosX ldps + (9 * fromIntegral (_siOffX selit))) (_ldpPosY ldps) cfig j col wdth (_siHeight selit)
   where
-    lis = _slItems sl
     wdth = case _ldpWidth ldps of
         FixedSelectionWidth x -> x
         _ -> 1
 
+drawSelectionCursor :: ListDisplayParams -> Configuration -> SelectionList a -> Picture
+drawSelectionCursor ldps cfig sl = drawCursorAt ldps cfig (sl ^. slSelPos) (sl ^. slItems)
+
 -- given a list of pictures that are each the size of a "text" call, displays them as
 -- a list on the screen
 listPicturesAt :: Float -> Float -> Configuration -> [Picture] -> Picture