Improve menu highlight and add padding

Author: TristanCacqueray

src/Swarm/TUI/Attr.hs

@@ -47,6 +47,7 @@ swarmAttrMap =
     , (sandAttr, fg (V.rgbColor @Int 194 178 128))
     , (fireAttr, fg V.red `V.withStyle` V.bold)
     , (redAttr, fg V.red)
+    , (notifAttr, fg V.yellow `V.withStyle` V.bold)
     , (greenAttr, fg V.green)
     , (blueAttr, fg V.blue)
     , (deviceAttr, fg V.yellow `V.withStyle` V.bold)
@@ -85,6 +86,7 @@ robotAttr
   , baseAttr
   , fireAttr
   , redAttr
+  , notifAttr
   , greenAttr
   , blueAttr
   , woodAttr
@@ -119,13 +121,14 @@ snowAttr = "snow"
 sandAttr = "sand"
 fireAttr = "fire"
 redAttr = "red"
+highlightAttr = "highlight"
 greenAttr = "green"
 blueAttr = "blue"
 rockAttr = "rock"
 woodAttr = "wood"
 baseAttr = "base"
 deviceAttr = "device"
-highlightAttr = "highlight"
+notifAttr = "notif"
 sepAttr = "sep"
 infoAttr = "info"
 defAttr = "def"

src/Swarm/TUI/View.hs

@@ -363,15 +363,15 @@ helpWidget = (helpKeys <=> fill ' ') <+> (helpCommands <=> fill ' ')
     ]
 
 helpRecipes :: Int -> [Recipe Entity] -> Widget Name
-helpRecipes count xs = viewport RecipesViewport Vertical (vBox recipesLists)
+helpRecipes count xs = viewport RecipesViewport Vertical (padTop (Pad 1) $ vBox recipesLists)
  where
   (news, knowns) = splitAt count xs
   recipesLists = drawRecipes news <> sepRecipes <> drawRecipes knowns
   drawRecipes = map (padLeftRight 18 . padBottom (Pad 1) . drawRecipe Nothing Nothing)
   -- TODO: figure out how to make the whole hBorder to be red, not just the label
   sepRecipes
     | count > 0 && not (null knowns) =
-      [ padBottom (Pad 1) (withAttr "red" $ hBorderWithLabel (padLeftRight 1 (txt "new↑")))
+      [ padBottom (Pad 1) (withAttr redAttr $ hBorderWithLabel (padLeftRight 1 (txt "new↑")))
       ]
     | otherwise = []
 
@@ -392,6 +392,7 @@ drawKeyMenu s =
     . (++ [gameModeWidget])
     . map (padLeftRight 1 . drawKeyCmd)
     . (globalKeyCmds ++)
+    . map (\(k, n) -> (NoHighlight, k, n))
     . keyCmdsFor
     . focusGetCurrent
     . view (uiState . uiFocusRing)
@@ -405,11 +406,11 @@ drawKeyMenu s =
 
   availRecipes
     | null (s ^. gameState . availableRecipes) = []
-    | otherwise = [("F2", knownMark (s ^. gameState . availableRecipesNewCount) <> "Recipes")]
-
-  knownMark count
-    | count > 0 = "*"
-    | otherwise = ""
+    | otherwise =
+      let highlight
+            | s ^. gameState . availableRecipesNewCount > 0 = Highlighted
+            | otherwise = NoHighlight
+       in [(highlight, "F2", "Recipes")]
 
   gameModeWidget =
     padLeft Max . padLeftRight 1
@@ -419,7 +420,10 @@ drawKeyMenu s =
         False -> "Classic"
         True -> "Creative"
   globalKeyCmds =
-    [("F1", "help")] <> availRecipes <> [("Tab", "cycle")] <> [("^k", "creative") | cheat]
+    [(NoHighlight, "F1", "help")]
+      <> availRecipes
+      <> [(NoHighlight, "Tab", "cycle")]
+      <> [(NoHighlight, "^k", "creative") | cheat]
 
   keyCmdsFor (Just REPLPanel) =
     [ ("↓↑", "history")
@@ -445,9 +449,12 @@ drawKeyMenu s =
     ]
   keyCmdsFor _ = []
 
+data KeyHighlight = NoHighlight | Highlighted
+
 -- | Draw a single key command in the menu.
-drawKeyCmd :: (Text, Text) -> Widget Name
-drawKeyCmd (key, cmd) = txt $ T.concat ["[", key, "] ", cmd]
+drawKeyCmd :: (KeyHighlight, Text, Text) -> Widget Name
+drawKeyCmd (Highlighted, key, cmd) = hBox [withAttr notifAttr (txt $ T.concat ["[", key, "] "]), txt cmd]
+drawKeyCmd (NoHighlight, key, cmd) = txt $ T.concat ["[", key, "] ", cmd]
 
 ------------------------------------------------------------
 -- World panel