diff --git a/internal/tui/overlay.go b/internal/tui/overlay.go index a55054b..08b1f88 100644 --- a/internal/tui/overlay.go +++ b/internal/tui/overlay.go @@ -68,8 +68,6 @@ func placeOverlay(x, y int, fg, bg string, opts ...WhitespaceOption) string { var b strings.Builder - b.WriteString("\x1b_Ga=d\x1b\\") - for i, bgLine := range bgLines { if i > 0 { b.WriteByte('\n') diff --git a/internal/tui/slide.go b/internal/tui/slide.go index 6fc0e74..768530f 100644 --- a/internal/tui/slide.go +++ b/internal/tui/slide.go @@ -49,11 +49,7 @@ func (s *Slide) Update() (*Slide, tea.Cmd) { transition, cmd := s.ActiveTransition.Update() s.ActiveTransition = transition - // Update timer - // var timerCmd tea.Cmd - // s.Timer, timerCmd = s.Timer.Update(TimerTickMsg{}) - - return s, tea.Batch(cmd) + return s, cmd } func (s *Slide) View(animating bool) string { diff --git a/internal/tui/tui.go b/internal/tui/tui.go index 51790b4..c806358 100644 --- a/internal/tui/tui.go +++ b/internal/tui/tui.go @@ -1,7 +1,9 @@ package tui import ( + "fmt" "log/slog" + "time" "github.com/charmbracelet/bubbles/help" "github.com/charmbracelet/bubbles/key" @@ -159,9 +161,9 @@ func (m model) Init() tea.Cmd { return tea.Batch( tea.ClearScreen, - // tea.Tick(time.Second, func(time.Time) tea.Msg { - // return TimerTickMsg{} - // }), + tea.Tick(time.Second, func(time.Time) tea.Msg { + return TimerTickMsg{} + }), ) } @@ -323,10 +325,11 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { slide, cmd := m.slide.Update() m.slide = slide return m, cmd - // case TimerTickMsg: - // var cmd tea.Cmd - // m.globalTimer, cmd = m.globalTimer.Update(msg) - // return m, cmd + case TimerTickMsg: + var cmd tea.Cmd + m.globalTimer, cmd = m.globalTimer.Update(msg) + m.slide.Timer, _ = m.slide.Timer.Update(msg) + return m, cmd } return m, nil @@ -350,10 +353,12 @@ func (m model) View() string { ) if m.command != nil && m.command.IsShowing() { + fmt.Print("\x1b_Ga=d\x1b\\") return m.command.Show(slideView, m.width, m.height) } if m.goTo != nil && m.goTo.IsShowing() { + fmt.Print("\x1b_Ga=d\x1b\\") return m.goTo.Show(slideView, m.width, m.height) }