Garmelon/forest
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect folding when rendering nodes

Browse source
This commit is contained in:
Joscha 2020-02-09 11:29:28 +00:00
parent 3255bfd2ec
commit 19a4350cb6
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Forest/Client/Node.hs
View file

@ -6,7 +6,6 @@ module Forest.Client.Node
) where ) where
import Brick import Brick
import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
import Forest.Client.NodeEditor import Forest.Client.NodeEditor
@ -23,6 +22,9 @@ data DrawState = DrawState
isFocused :: DrawState -> Bool isFocused :: DrawState -> Bool
isFocused ds = (isLocalPath <$> dsFocused ds) == Just True isFocused ds = (isLocalPath <$> dsFocused ds) == Just True
isFolded :: DrawState -> Bool
isFolded ds = not $ localPath `Set.member` dsUnfolded ds
narrowDrawState :: NodeId -> DrawState -> DrawState narrowDrawState :: NodeId -> DrawState -> DrawState
narrowDrawState nodeId ds = ds narrowDrawState nodeId ds = ds
{ dsUnfolded = narrowSet nodeId $ dsUnfolded ds { dsUnfolded = narrowSet nodeId $ dsUnfolded ds
@ -36,15 +38,13 @@ nodeToWidget focused node =
focusStyle = if focused then "focus" else "nofocus" focusStyle = if focused then "focus" else "nofocus"
in withDefAttr focusStyle $ withDefAttr expandStyle nodeWidget in withDefAttr focusStyle $ withDefAttr expandStyle nodeWidget
subnodeToTree :: NodeId -> DrawState -> Node -> WidgetTree ResourceName subnodeToTree :: DrawState -> NodeId -> Node -> WidgetTree ResourceName
subnodeToTree nodeId ds node = subnodeToTree ds nodeId node =
let newDs = narrowDrawState nodeId ds let newDs = narrowDrawState nodeId ds
in nodeToTree newDs node in nodeToTree newDs node
subnodesToTrees :: DrawState -> Map.Map NodeId Node -> [WidgetTree ResourceName] subnodesToTrees :: DrawState -> Node -> [WidgetTree ResourceName]
subnodesToTrees ds nodes = subnodesToTrees ds = mapChildren (subnodeToTree ds)
map (\(nodeId, node) -> subnodeToTree nodeId ds node) $
Map.toAscList nodes
nodeToTree :: DrawState -> Node -> WidgetTree ResourceName nodeToTree :: DrawState -> Node -> WidgetTree ResourceName
nodeToTree ds node = case dsEditor ds of nodeToTree ds node = case dsEditor ds of
@ -55,5 +55,6 @@ nodeToTree ds node = case dsEditor ds of
| otherwise -> WidgetTree (renderNodeEditor ed) subnodeWidgets | otherwise -> WidgetTree (renderNodeEditor ed) subnodeWidgets
where where
focused = isFocused ds focused = isFocused ds
folded = isFolded ds
nodeWidget = nodeToWidget focused node nodeWidget = nodeToWidget focused node
subnodeWidgets = subnodesToTrees ds $ nodeChildren node subnodeWidgets = if folded then [] else subnodesToTrees ds node