diff --git a/app/ghcup/BrickMain.hs b/app/ghcup/BrickMain.hs index ba6d8bc..3eac80b 100644 --- a/app/ghcup/BrickMain.hs +++ b/app/ghcup/BrickMain.hs @@ -169,7 +169,7 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..} | elem Latest lTag && not lInstalled = withAttr "hooray" | otherwise = id - active = if b then forceAttr "active" else id + active = if b then putCursor "GHCup" (Location (0,0)) . forceAttr "active" else id in hooray $ active $ dim ( marks <+> padLeft (Pad 2) @@ -257,7 +257,7 @@ app attrs dimAttrs = , appHandleEvent = eventHandler , appStartEvent = return , appAttrMap = const attrs - , appChooseCursor = neverShowCursor + , appChooseCursor = showFirstCursor } defaultAttributes :: Bool -> AttrMap diff --git a/cabal.project b/cabal.project index f95024f..9781ef4 100644 --- a/cabal.project +++ b/cabal.project @@ -8,6 +8,11 @@ package ghcup tests: True flags: +tui +source-repository-package + type: git + location: https://github.com/jtdaugherty/brick.git + tag: b3b96cfe66dfd398d338e3feb2b6855e66a35190 + source-repository-package type: git location: https://github.com/Bodigrim/tar diff --git a/ghcup.cabal b/ghcup.cabal index 330069d..5bd5b8c 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -233,7 +233,7 @@ executable ghcup cpp-options: -DBRICK other-modules: BrickMain build-depends: - , brick >=0.5 && <0.62 + , brick >=0.5 && <0.64 , transformers ^>=0.5 , vector ^>=0.12 , vty >=5.28.2 && <5.34 diff --git a/stack.yaml b/stack.yaml index a4a83c6..eb0ceb6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -10,6 +10,9 @@ extra-deps: - git: https://github.com/Bodigrim/tar commit: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf + - git: https://github.com/jtdaugherty/brick.git + commit: b3b96cfe66dfd398d338e3feb2b6855e66a35190 + - IfElse-0.85@sha256:6939b94acc6a55f545f63a168a349dd2fbe4b9a7cca73bf60282db5cc6aa47d2,445 - ascii-string-1.0.1.4@sha256:fa34f1d9ba57e8e89c0d4c9cef5e01ba32cb2d4373d13f92dcc0b531a6c6749b,2582 - base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231