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

[client] Fix rendering of editor

Browse source
This commit is contained in:
Joscha 2020-02-19 23:37:22 +00:00
parent 661c233ce1
commit 385ec894ef
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Forest/Client/UiState.hs
View file

@ -212,25 +212,21 @@ renderNode focused node =
decorateExpand (not $ OMap.null $ nodeChildren node) $
txtWrap $ nodeText node
beingEdited :: UiState n -> Path -> Maybe (EditorInfo n)
beingEdited s path = do
e <- uiEditor s
if eiReply e
then do
p <- parent path
guard $ p == eiPath e
else
guard $ path == eiPath e
pure e
nodeToTree :: (Ord n, Show n) => UiState n -> Path -> Node -> Maybe [WidgetTree n] -> WidgetTree n
nodeToTree s path node = withChildren $ case beingEdited s path of
Just e -> renderNodeEditor $ eiEditor e
Nothing -> renderNode isFocused node
nodeToTree s path node maybeChildren = case uiEditor s of
Nothing ->
let isFocused = path == uiFocused s
in WidgetTree (renderNode isFocused node) children
Just e ->
let renderedEditor = renderNodeEditor $ eiEditor e
renderedEditorTree = WidgetTree renderedEditor []
in if path /= eiPath e
then WidgetTree (renderNode False node) children
else if eiReply e
then WidgetTree (renderNode False node) $ children ++ [renderedEditorTree]
else WidgetTree renderedEditor children
where
withChildren :: Widget n -> Maybe [WidgetTree n] -> WidgetTree n
withChildren nodeWidget = WidgetTree nodeWidget . fromMaybe []
isFocused = isNothing (uiEditor s) && (path == uiFocused s)
children = fromMaybe [] maybeChildren
renderUiState :: (Ord n, Show n) => IndentOptions -> UiState n -> Widget n
renderUiState opts s =