Skip to content
Snippets Groups Projects
Commit f3fa3f29 authored by Matthew Pickering's avatar Matthew Pickering
Browse files

ui: Generalise KeybindingsMode to a general overlay setting

parent d3d53c1a
No related branches found
No related tags found
1 merge request!23tui: Command Picker and some other clean-up improvements
......@@ -105,9 +105,9 @@ myAppDraw (AppState majorState' _) =
where
kbOverlay :: KeybindingsMode -> [Widget Name] -> [Widget Name]
kbOverlay :: OverlayMode -> [Widget Name] -> [Widget Name]
kbOverlay KeybindingsShown ws = centerLayer kbWindow : ws
kbOverlay KeybindingsHidden ws = ws
kbOverlay NoOverlay ws = ws
kbWindow :: Widget Name
kbWindow =
......@@ -277,7 +277,7 @@ myAppHandleEvent brickEvent = do
PausedMode
(OperationalState Nothing
SavedAndGCRoots
KeybindingsHidden
NoOverlay
FooterInfo
(DefaultRoots initRoots)
rootsTree
......@@ -523,9 +523,9 @@ handleMain dbg e = do
case view keybindingsMode os of
KeybindingsShown ->
case e of
VtyEvent (Vty.EvKey _ _) -> put $ os & keybindingsMode .~ KeybindingsHidden
VtyEvent (Vty.EvKey _ _) -> put $ os & keybindingsMode .~ NoOverlay
_ -> put os
_ -> case view footerMode os of
NoOverlay -> case view footerMode os of
FooterInput fm form -> inputFooterHandler dbg fm form (handleMainWindowEvent dbg) (() <$ e)
_ -> handleMainWindowEvent dbg (() <$ e)
_ -> return ()
......
......@@ -122,8 +122,9 @@ data FooterMode = FooterInfo
data FooterInputMode = FAddress | FSearch | FProfile | FRetainer | FRetainerExact | FSnapshot
data KeybindingsMode = KeybindingsShown
| KeybindingsHidden
data OverlayMode = KeybindingsShown
| NoOverlay
formatFooterMode :: FooterInputMode -> Text
formatFooterMode FAddress = "address (0x..): "
......@@ -150,7 +151,7 @@ currentRoots (SearchedRoots cp) = cp
data OperationalState = OperationalState
{ _running_task :: Maybe ThreadId
, _treeMode :: TreeMode
, _keybindingsMode :: KeybindingsMode
, _keybindingsMode :: OverlayMode
, _footerMode :: FooterMode
, _rootsFrom :: RootsOrigin
, _treeSavedAndGCRoots :: IOTree (ClosureDetails) Name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment