WIP UI controls

swarm-game · Feb 19, 2023 · dde6002 · dde6002
1 parent f9acda0
commit dde6002
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/Swarm/Game/Scenario/Launch/Controller.hs b/src/Swarm/Game/Scenario/Launch/Controller.hs
@@ -20,8 +20,15 @@ handleLaunchOptionsEvent ::
   BrickEvent Name AppEvent ->
   EventM Name AppState ()
 handleLaunchOptionsEvent siPair = \case
-  CharKey '\t' -> do
+  Key V.KBackTab ->
+    uiState . uiLaunchConfig . scenarioConfigFocusRing %= focusPrev
+  Key V.KUp ->
+    uiState . uiLaunchConfig . scenarioConfigFocusRing %= focusPrev
+  CharKey '\t' -> 
     uiState . uiLaunchConfig . scenarioConfigFocusRing %= focusNext
+  Key V.KDown -> 
+    uiState . uiLaunchConfig . scenarioConfigFocusRing %= focusNext
+
   Key V.KEnter -> do
     fr <- use $ uiState . uiLaunchConfig . scenarioConfigFocusRing
     case focusGetCurrent fr of
@@ -54,4 +61,8 @@ handleLaunchOptionsEvent siPair = \case
         StartGameButton -> return ()
       _ -> return ()
  where
-  closeModal = uiState . uiLaunchConfig . isDisplayedFor .= Nothing
+  closeModal = do
+    fb <- use $ uiState . uiLaunchConfig . fileBrowser
+    if null fb
+      then uiState . uiLaunchConfig . isDisplayedFor .= Nothing
+      else uiState . uiLaunchConfig . fileBrowser .= Nothing
diff --git a/src/Swarm/Game/Scenario/Launch/View.hs b/src/Swarm/Game/Scenario/Launch/View.hs
@@ -52,14 +52,23 @@ drawLaunchConfigPanel (LaunchOptions maybeFileBrowser seedEditor ring _isDisplay
     Just (ScenarioConfigControl (ScenarioConfigPanelControl SeedSelector)) -> True
     _ -> False
 
+  highlightIfFocused x = if focusGetCurrent ring == Just (ScenarioConfigControl (ScenarioConfigPanelControl x))
+    then withAttr highlightAttr
+    else id
+
+  mkButton name label = highlightIfFocused name $ str label
+
   panelWidget =
     centerLayer $
       borderWithLabel (str "Configure scenario") $
         hLimit 50 $
           vBox
             [ padAll 1 $ txt "Hello there!"
-            , overrideAttr E.editFocusedAttr customEditFocusedAttr $
-                renderEditor (txt . mconcat) seedEditorHasFocus seedEditor
-            , hCenter $ str "Select script"
-            , hCenter $ str "Launch"
+            , hBox [
+                mkButton SeedSelector "Seed: "
+              , overrideAttr E.editFocusedAttr customEditFocusedAttr $
+                 renderEditor (txt . mconcat) seedEditorHasFocus seedEditor
+              ]
+            , hCenter $ mkButton ScriptSelector ">> Select script <<"
+            , hCenter $ mkButton StartGameButton ">> Launch with these settings <<"
             ]