itAdd new popup for submitted flags and cleanup drawing/focus - scoreboard - Interactive scoreboard for CTF-like games Err z3bra.org 70 hgit clone git://git.z3bra.org/scoreboard.git URL:git://git.z3bra.org/scoreboard.git z3bra.org 70 1Log /scm/scoreboard/log.gph z3bra.org 70 1Files /scm/scoreboard/files.gph z3bra.org 70 1Refs /scm/scoreboard/refs.gph z3bra.org 70 i--- Err z3bra.org 70 1commit 0503ec4c0e923db118064edb9db6648eebc33478 /scm/scoreboard/commit/0503ec4c0e923db118064edb9db6648eebc33478.gph z3bra.org 70 1parent 9bb93f39ff3606bde881bbdee57b5fb355613aa2 /scm/scoreboard/commit/9bb93f39ff3606bde881bbdee57b5fb355613aa2.gph z3bra.org 70 hAuthor: Willy Goiffon URL:mailto:contact@z3bra.org z3bra.org 70 iDate: Wed, 2 Oct 2024 23:53:34 +0200 Err z3bra.org 70 i Err z3bra.org 70 iAdd new popup for submitted flags and cleanup drawing/focus Err z3bra.org 70 i Err z3bra.org 70 iDiffstat: Err z3bra.org 70 i M main.go | 1 + Err z3bra.org 70 i M ui.go | 5 +++-- Err z3bra.org 70 i Err z3bra.org 70 i2 files changed, 4 insertions(+), 2 deletions(-) Err z3bra.org 70 i--- Err z3bra.org 70 1diff --git a/main.go b/main.go /scm/scoreboard/file/main.go.gph z3bra.org 70 it@@ -180,6 +180,7 @@ func main() { Err z3bra.org 70 i scoreboard.HighlightBoard(scoreboard.player.Rank() + 1) Err z3bra.org 70 i scoreboard.pages.RemovePage("token") Err z3bra.org 70 i scoreboard.GenerateHTML() Err z3bra.org 70 i+ scoreboard.Popup("CONGRATULATIONS", fmt.Sprintf("[::-]Badge: [::b]%s[::-]\nScore: [::b]%d[::-]\n", scoreboard.flag.badge, scoreboard.flag.score)) Err z3bra.org 70 i }) Err z3bra.org 70 i Err z3bra.org 70 i scoreboard.pages.AddAndSwitchToPage("token", page, true) Err z3bra.org 70 1diff --git a/ui.go b/ui.go /scm/scoreboard/file/ui.go.gph z3bra.org 70 it@@ -199,6 +199,7 @@ func (a *Application) Message(title, text string) { Err z3bra.org 70 i }) Err z3bra.org 70 i Err z3bra.org 70 i a.pages.AddAndSwitchToPage("popup", p, true) Err z3bra.org 70 i+ a.app.SetFocus(p) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i func (a *Application) Popup(title, text string) { Err z3bra.org 70 it@@ -207,6 +208,7 @@ func (a *Application) Popup(title, text string) { Err z3bra.org 70 i }) Err z3bra.org 70 i Err z3bra.org 70 i a.pages.AddAndSwitchToPage("popup", p, true) Err z3bra.org 70 i+ a.app.SetFocus(p) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i func (a *Application) Fatal(err error) { Err z3bra.org 70 it@@ -215,6 +217,7 @@ func (a *Application) Fatal(err error) { Err z3bra.org 70 i }) Err z3bra.org 70 i Err z3bra.org 70 i a.pages.AddAndSwitchToPage("popup", p, true) Err z3bra.org 70 i+ a.app.SetFocus(p) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i func (a *Application) Token(callback func()) tview.Primitive { Err z3bra.org 70 it@@ -260,8 +263,6 @@ func (a *Application) Token(callback func()) tview.Primitive { Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i a.pages.RemovePage("token"); Err z3bra.org 70 i- a.frame.Clear() Err z3bra.org 70 i- a.frame.AddText(fmt.Sprintf("🔑%s", a.player.token), false, tview.AlignCenter, 0) Err z3bra.org 70 i callback() Err z3bra.org 70 i }) Err z3bra.org 70 i Err z3bra.org 70 .