defunkt/difi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from Lufftre/fix/truncate-long-lines

Browse Source
This commit is contained in:
Tommy Guo 2026-02-04 08:33:25 -05:00 committed by GitHub
commit 731fb3b5b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ui/model.go
View File

@ -11,6 +11,7 @@ import (
"github.com/charmbracelet/bubbles/viewport" "github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/x/ansi"
"github.com/oug-t/difi/internal/config" "github.com/oug-t/difi/internal/config"
"github.com/oug-t/difi/internal/git" "github.com/oug-t/difi/internal/git"
@ -402,7 +403,7 @@ func (m *Model) updateSizes() {
} }
m.fileList.SetSize(treeWidth, listHeight) m.fileList.SetSize(treeWidth, listHeight)
m.diffViewport.Width = m.width - treeWidth - 2 m.diffViewport.Width = m.width - treeWidth - 4 // border (2) + padding (2) from tree pane
m.diffViewport.Height = listHeight m.diffViewport.Height = listHeight
} }
@ -455,8 +456,14 @@ func (m Model) View() string {
end = len(m.diffLines) end = len(m.diffLines)
} }
// 5 for line number (Width 4 + MarginRight 1), 2 for indent
maxLineWidth := m.diffViewport.Width - 7
if maxLineWidth < 1 {
maxLineWidth = 1
}
for i := start; i < end; i++ { for i := start; i < end; i++ {
line := m.diffLines[i] line := ansi.Truncate(m.diffLines[i], maxLineWidth, "")
var numStr string var numStr string
mode := "relative" mode := "relative"