diff --git a/data/charMaps/cMap16x32.Custom.png b/data/charMaps/cMap16x32.Custom.png index 81c5901f8..a73e35235 100644 Binary files a/data/charMaps/cMap16x32.Custom.png and b/data/charMaps/cMap16x32.Custom.png differ diff --git a/ghcidOutput b/ghcidOutput index 44651c24c..b8fe98076 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 10:28:16) +All good (594 modules, at 19:29:05) diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index a630be0c4..3b99141c6 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -230,7 +230,7 @@ updateSection sis mcsel availablelines ss = ss & ssItems .~ sis & ssOffset .~ offset - & ssShownItems .~ shownitems + & ssShownItems .~ tweakfirst shownitems where oldoffset = ss ^. ssOffset nocursoroffset = @@ -261,16 +261,16 @@ updateSection sis mcsel availablelines ss = _ -> oldoffset tweakfirst (x : xs) | offset > 0 = - translate 0 (-100) (color moreupcolor $ text (theindent ++ replicate 15 '^')) : - map h xs - | otherwise = map h (x : xs) + (color moreupcolor $ text (theindent ++ replicate 15 (toEnum 30))) : + xs + | otherwise = (x : xs) tweakfirst [] = [] moreupcolor = fromMaybe white $ allstrings ^? ix offset . _1 shownitems | length shownstrings > availablelines = - tweakfirst (take (availablelines - 1) shownstrings) - ++ [translate 0 100 . color moredowncolor . textVMirror $ theindent ++ replicate 15 '^'] - | otherwise = tweakfirst shownstrings + (map h $ take (availablelines - 1) shownstrings) + ++ [color moredowncolor . text $ theindent ++ replicate 15 (toEnum 31)] + | otherwise = map h shownstrings moredowncolor = fromMaybe white $ allstrings ^? ix (offset + availablelines - 1) . _1 allstrings = listSelectionColorPicture sis shownstrings = drop offset allstrings diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index 2abcef34a..7083ee6d7 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -131,10 +131,11 @@ getMouseInvSel w = case w ^? hud . hudElement . subInventory . nsSelected of drawDISelections :: World -> Picture drawDISelections w = fromMaybe mempty $ do - ((_, j), (_, b)) <- getMouseInvSel w + ((i, j), (a, b)) <- getMouseInvSel w + guard $ i == a sss <- w ^? hud . hudElement . diSections let idp = invDisplayParams w - let f x = selSecDrawCursorAt 15 idp BackdropCursor sss (0,x) + let f x = selSecDrawCursorAt 15 idp BackdropCursor sss (i,x) return . color (withAlpha 0.2 white) . foldMap f $ [min j b..max j b] drawSubInventory :: SubInventory -> Configuration -> World -> Picture