From d68cb97f6b478800ffe871119db264e747d6db68 Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 2 Jan 2026 18:55:40 +0000 Subject: [PATCH] Tweak rmb cursor display --- src/Dodge/Render/HUD.hs | 4 ++-- src/Dodge/SelectionSections/Draw.hs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index f782a13d7..9030fa295 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -97,8 +97,8 @@ drawRootCursor w sss msel ldp cfig = fromMaybe mempty $ do return $ drawSSMultiCursor sss - (Just (0, x)) - (Just (y - x)) + (0, x) + (y - x) ldp curs cfig diff --git a/src/Dodge/SelectionSections/Draw.hs b/src/Dodge/SelectionSections/Draw.hs index d009febb8..bdea1f35b 100644 --- a/src/Dodge/SelectionSections/Draw.hs +++ b/src/Dodge/SelectionSections/Draw.hs @@ -36,23 +36,22 @@ drawSSCursor sss ldp curs cfig = drawSSMultiCursor :: IMSS a -> - Maybe (Int, Int) -> - Maybe Int -> + (Int, Int) -> + Int -> LDParams -> CursorDisplay -> Config -> Picture -drawSSMultiCursor sss msel mextra ldp curs cfig = translateScreenPos cfig (ldp ^. ldpPos) +drawSSMultiCursor sss (i,j) ydown ldp curs cfig = translateScreenPos cfig (ldp ^. ldpPos) . fold $ do - (i, j) <- msel yint <- selSecYint i j sss - ydown <- mextra ssitms <- sss ^? ix i . ssItems sindent <- sss ^? ix i . ssIndent let selitms = fst . IM.split (j + ydown + 1) . snd . IM.split (j -1) $ ssitms ysize = sum . fmap _siHeight $ selitms - maxxoff = maximum . fmap _siOffX $ selitms + f x = 1 + _siOffX x + maximum (15 : (length <$> _siPictures x)) + maxxoff = maximum . fmap f $ selitms minxoff = minimum . fmap _siOffX $ selitms return $ listCursor @@ -62,5 +61,6 @@ drawSSMultiCursor sss msel mextra ldp curs cfig = translateScreenPos cfig (ldp ^ yint (minxoff + sindent) white - (15 + maxxoff - minxoff) + --(15 + maxxoff - minxoff) + maxxoff ysize