Skip to content

Commit 76ba59d

Browse files
committed
fix(tui|markdown): properly clear kitty images
1 parent fc271b6 commit 76ba59d

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

internal/markdown/renderer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ func (r *Renderer) RenderBytes(in []byte, animating bool) (string, error) {
6363
var b strings.Builder
6464

6565
// Clear kitty images
66-
b.WriteString("\x1b_Ga=d\x1b\\")
67-
b.WriteString("\x1b_Ga=d,p=1\x1b\\")
68-
b.WriteString("\x1b[0m")
66+
if !animating {
67+
b.WriteString("\x1b_Ga=d\x1b\\")
68+
}
6969

7070
for n := r.parser.Parse(in); n != nil; n = n.Next() {
7171
switch n.Kind() {

internal/tui/overlay.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ func placeOverlay(x, y int, fg, bg string, opts ...WhitespaceOption) string {
6767
}
6868

6969
var b strings.Builder
70+
71+
b.WriteString("\x1b_Ga=d\x1b\\")
72+
7073
for i, bgLine := range bgLines {
7174
if i > 0 {
7275
b.WriteByte('\n')

internal/tui/transitions/transition.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package transitions
22

33
import (
4+
"fmt"
45
"time"
56

67
tea "github.com/charmbracelet/bubbletea"
@@ -18,6 +19,7 @@ type FrameMsg time.Time
1819
const Fps = 60
1920

2021
func Animate(fps time.Duration) tea.Cmd {
22+
fmt.Print("\x1b_Ga=d\x1b\\")
2123
return tea.Tick(time.Second/fps, func(t time.Time) tea.Msg {
2224
return FrameMsg(t)
2325
})

internal/tui/tui.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,18 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
335335
func (m model) View() string {
336336
m.slide.Style = style(m.width, m.height, m.slide.Properties.Style)
337337

338+
hasOverlay := (m.command != nil && m.command.IsShowing()) ||
339+
(m.goTo != nil && m.goTo.IsShowing()) ||
340+
(m.jump != nil && m.jump.IsShowing())
341+
338342
slideView := lipgloss.Place(
339343
m.width,
340344
m.height,
341345
lipgloss.Center,
342346
lipgloss.Center,
343-
m.slide.View(m.slide.ActiveTransition != nil && m.slide.ActiveTransition.Animating()),
347+
m.slide.View(
348+
(m.slide.ActiveTransition != nil && m.slide.ActiveTransition.Animating()) || hasOverlay,
349+
),
344350
)
345351

346352
if m.command != nil && m.command.IsShowing() {

0 commit comments

Comments
 (0)