diff --git a/ghcidOutput b/ghcidOutput index bb3c15543..d79c6c46f 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 10:49:27) +All good (594 modules, at 10:56:37) diff --git a/src/Dodge/Data/SelectionList.hs b/src/Dodge/Data/SelectionList.hs index c87c60af9..07c4422db 100644 --- a/src/Dodge/Data/SelectionList.hs +++ b/src/Dodge/Data/SelectionList.hs @@ -31,6 +31,7 @@ data SelectionSection a = SelectionSection { _ssItems :: IntMap (SelectionItem a) , _ssOffset :: Int , _ssShownItems :: [Picture] + , _ssIndent :: Int } type IMSS a = IntMap (SelectionSection a) diff --git a/src/Dodge/Default/World.hs b/src/Dodge/Default/World.hs index ed1d8a8ea..ea5f12370 100644 --- a/src/Dodge/Default/World.hs +++ b/src/Dodge/Default/World.hs @@ -190,6 +190,7 @@ defaultSS = { _ssItems = mempty , _ssOffset = 0 , _ssShownItems = [] + , _ssIndent = 0 } defaultCOSection :: SelectionSection () diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 48e329d16..e6c16b445 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -312,9 +312,7 @@ updateSection sis mcsel availablelines ss = moredowncolor = fromMaybe white $ allstrings ^? ix (offset + availablelines - 1) . _1 allstrings = listSelectionColorPicture sis shownstrings = drop offset allstrings - --h (_, str) = translate (fromIntegral (_ssIndent ss) * 100) 0 str h (_, str) = str --- theindent = replicate (_ssIndent ss) ' ' listSelectionColorPicture :: Foldable t => t (SelectionItem a) -> [(Color, Picture)] listSelectionColorPicture = foldMap f @@ -347,9 +345,9 @@ enterCombineInv cfig w = filtsection = SelectionSection { _ssItems = mempty - , -- , _ssMinSize = 0 - _ssOffset = 0 + , _ssOffset = 0 , _ssShownItems = mempty + , _ssIndent = 0 } combsection = updateSection @@ -358,9 +356,9 @@ enterCombineInv cfig w = availablelines SelectionSection { _ssItems = cm - , -- , _ssMinSize = 5 - _ssOffset = 0 + , _ssOffset = 0 , _ssShownItems = mempty + , _ssIndent = 0 } regexList :: String -> [String] -> Bool