From 3f9b31a838d9b7ae380b7319377303939146442d Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 4 Nov 2024 19:30:15 +0000 Subject: [PATCH] Cleanup --- data/charMaps/cMap16x32.Custom.png | Bin 12188 -> 12325 bytes ghcidOutput | 2 +- src/Dodge/DisplayInventory.hs | 14 +++++++------- src/Dodge/Render/HUD.hs | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/charMaps/cMap16x32.Custom.png b/data/charMaps/cMap16x32.Custom.png index 81c5901f8360201b5b9297a58108808a4f2e98ec..a73e35235d24b38c09d0e6bfbbfbaa5464e2056c 100644 GIT binary patch delta 8031 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 delta 7896 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 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