Stop equip after combining

src/Dodge/Render/List.hs

@@ -2,7 +2,7 @@ module Dodge.Render.List (
     renderListAt,
     drawList,
     drawSelectionList,
-    listPicturesYgapScaleYoff,
+    drawListYgapScaleYoff,
     drawListElement,
     selSecDrawCursor,
     dShadCol,
@@ -30,7 +30,7 @@ drawSelectionList ldps cfig sl =
     translateScreenPos
         cfig
         (ldps ^. ldpPos)
-        $ listPicturesYgapScaleYoff
+        $ drawListYgapScaleYoff
             (_ldpVerticalGap ldps)
             (_ldpScale ldps)
             0
@@ -72,10 +72,10 @@ getLDPWidth ldps = case _ldpWidth ldps of
         _ -> 1
 
 drawListYoff :: Int -> [Picture] -> Picture
-drawListYoff = listPicturesYgapScaleYoff 0 1
+drawListYoff = drawListYgapScaleYoff 0 1
 
-listPicturesYgapScaleYoff :: Float -> Float -> Int -> [Picture] -> Picture
-listPicturesYgapScaleYoff ygap s i = mconcat . zipWith (drawListElement ygap s 0) [i ..]
+drawListYgapScaleYoff :: Float -> Float -> Int -> [Picture] -> Picture
+drawListYgapScaleYoff ygap s i = mconcat . zipWith (drawListElement ygap s 0) [i ..]
 
 stackPicturesAt :: [Picture] -> Picture
 stackPicturesAt = stackPicturesAtOff 0
@@ -113,8 +113,8 @@ listCursorChooseBorderScale ::
     Picture
 listCursorChooseBorderScale ygap s borders yint xint col cursxsize cursysize =
     translate
-        ((10 * s * (fromIntegral xint) - 5 * s))
-        (- (ygap + (s * 20 + ygap) * (fromIntegral yint) + 1))
+        ((10 * fromIntegral xint - 5) * s)
+        (- (ygap + (s * 20 + ygap) * fromIntegral yint ))
         . color col
         $ chooseCursorBorders (s * wth) (s * hgt) borders
   where
@@ -162,7 +162,7 @@ renderListAt tx ty = translate tx (- ty) . drawList . map (\(str, col) -> color
 -- given a list of pictures that are each the size of a "text" call, displays them as
 -- a list on the screen
 drawList :: [Picture] -> Picture
-drawList = listPicturesYgapScaleYoff 0 1 0
+drawList = drawListYgapScaleYoff 0 1 0
 
 --TODO put the following functions in an appropriate place
 
@@ -172,7 +172,4 @@ dShadCol :: Color -> Picture -> Picture
 dShadCol c p = color black (translate 1.2 (-1.2) p) <> color c p
 
 toTopLeft :: Configuration -> Picture -> Picture
-toTopLeft cfig = translate (- hw) (hh)
-  where
-    hw = halfWidth cfig
-    hh = halfHeight cfig
+toTopLeft cfig = translate (- halfWidth cfig) (halfHeight cfig)