Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notification popups #2027

Merged
merged 14 commits into from
Jul 14, 2024
Merged

Notification popups #2027

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
75aa955
basic notification popups
byorgey Jul 8, 2024
5631067
add some comments
byorgey Jul 13, 2024
8aacf0a
more fleshed out Notification type
byorgey Jul 13, 2024
b3738e2
Only show top-level achievement notification when first obtained
byorgey Jul 13, 2024
c0bc27e
rename Notification -> Popup (to avoid confusion with existing Notifi…
byorgey Jul 13, 2024
bd1896e
progress popups even when game is paused / modal is displayed
byorgey Jul 13, 2024
38c0419
Popup for new recipes/commands
byorgey Jul 13, 2024
2e489bb
remove unused LANGUAGE pragma
byorgey Jul 13, 2024
3b16918
normalize cabal file
byorgey Jul 13, 2024
faf4daf
fix scenario win + popup bug
byorgey Jul 13, 2024
0b98f12
show specific commands unlocked in popup
byorgey Jul 14, 2024
4d43dca
Use current keybindings for recipes and commands in popups
byorgey Jul 14, 2024
4828efa
remove unused [Text] field from recipes popup
byorgey Jul 14, 2024
a931841
apply review suggestions
byorgey Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix scenario win + popup bug
  • Loading branch information
@byorgey
byorgey committed Jul 14, 2024
commit faf4daf1398e434ec012130457b333aa4f80ac7b
4 changes: 3 additions & 1 deletion src/swarm-tui/Swarm/TUI/Controller.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,9 @@ handleMainEvent forceRedraw ev = do
case ev of
AppEvent ae -> case ae of
Frame
| not forceRedraw && s ^. gameState . temporal . paused -> continueWithoutRedraw
-- If the game is paused, don't run any game ticks, but do redraw the screen
-- if a redraw is forced.
| s ^. gameState . temporal . paused -> unless forceRedraw continueWithoutRedraw
| otherwise -> runFrameUI forceRedraw
Web (RunWebCode c) -> runBaseWebCode c
_ -> continueWithoutRedraw
Expand Down