Skip to content

feat: full screen panes #12

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

Merged
andrinoff merged 1 commit into from
Jul 9, 2026
Merged

feat: full screen panes #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
122 changes: 89 additions & 33 deletions commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type commitModel struct {
saved bool
err error
diffFocus bool
fullscreen bool
}

func newCommitModel(path string) *commitModel {
Expand Down Expand Up @@ -175,6 +176,13 @@ func (m *commitModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "esc", "tab":
m.diffFocus = false
m.editor.focused = true
if m.fullscreen {
m.layout()
}
return m, nil
case "ctrl+f":
m.fullscreen = !m.fullscreen
m.layout()
return m, nil
case "up", "k":
m.diffVP.ScrollUp(1)
Expand Down Expand Up @@ -208,6 +216,10 @@ func (m *commitModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, nil
}
return m, tea.Quit
case "ctrl+f":
m.fullscreen = !m.fullscreen
m.layout()
return m, nil
case "tab":
if len(m.editor.suggestions) > 0 && m.editor.selSug >= 0 {
m.editor.acceptSuggestion()
Expand All @@ -216,6 +228,9 @@ func (m *commitModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if m.diffReady {
m.diffFocus = true
m.editor.focused = false
if m.fullscreen {
m.layout()
}
}
return m, nil
}
Expand Down Expand Up @@ -253,10 +268,21 @@ func (m *commitModel) save() tea.Cmd {
}

func (m *commitModel) layout() {
headerHeight := 3 // header line + padding
footerHeight := 3 // footer line + padding
headerHeight := 1
footerHeight := 1
bodyHeight := m.height - headerHeight - footerHeight

if m.fullscreen {
if m.diffFocus && m.diffReady {
m.diffVP.SetWidth(m.width)
m.diffVP.SetHeight(bodyHeight)
} else {
m.editor.setWidth(m.width)
m.editor.setHeight(bodyHeight)
}
return
}

if m.diffReady {
diffHeight := min(bodyHeight/2, 20)
if diffHeight < 5 {
Expand All @@ -269,7 +295,7 @@ func (m *commitModel) layout() {
infoHeight = 10
}
}
editorHeight := bodyHeight - diffHeight - infoHeight - 2
editorHeight := bodyHeight - diffHeight - infoHeight - 3
if editorHeight < 3 {
editorHeight = 3
}
Expand All @@ -286,7 +312,7 @@ func (m *commitModel) layout() {
infoHeight = 10
}
}
editorHeight := bodyHeight - infoHeight - 1
editorHeight := bodyHeight - infoHeight
if editorHeight < 3 {
editorHeight = 3
}
Expand All @@ -313,9 +339,22 @@ func (m *commitModel) View() tea.View {
focusLabel = "diff"
}

statusText := fmt.Sprintf("ctrl+s save • esc cancel • %d lines %d words", lineCount, wordCount)
if m.diffReady {
statusText = fmt.Sprintf("ctrl+s save • esc cancel • %d lines %d words • tab: focus %s", lineCount, wordCount, focusLabel)
fsLabel := "fullscreen"
if m.fullscreen {
fsLabel = "unfullscreen"
}

var statusText string
if m.fullscreen {
statusText = fmt.Sprintf("ctrl+s save • esc cancel • ctrl+f %s", fsLabel)
if m.diffReady {
statusText += fmt.Sprintf(" • tab: focus %s", focusLabel)
}
} else {
statusText = fmt.Sprintf("ctrl+s save • esc cancel • ctrl+f %s • %d lines %d words", fsLabel, lineCount, wordCount)
if m.diffReady {
statusText = fmt.Sprintf("ctrl+s save • esc cancel • ctrl+f %s • %d lines %d words • tab: focus %s", fsLabel, lineCount, wordCount, focusLabel)
}
}
if m.saved {
statusText = "saved!"
Expand All @@ -330,38 +369,55 @@ func (m *commitModel) View() tea.View {
Width(m.width).
Render(statusText)

editorBody := m.editor.view()
var contentSections []string
contentSections = append(contentSections, header)

var sections []string
sections = append(sections, header, editorBody)
if m.fullscreen {
if m.diffFocus && m.diffReady {
contentSections = append(contentSections, m.diffVP.View())
} else {
contentSections = append(contentSections, m.editor.view())
}
} else {
contentSections = append(contentSections, m.editor.view())

if len(m.infoLines) > 0 {
sections = append(sections, m.renderInfoPanel())
}
if len(m.infoLines) > 0 {
contentSections = append(contentSections, m.renderInfoPanel())
}

if m.diffReady {
divLabel := " diff "
if m.diffFocus {
divLabel = " diff (focused) "
if m.diffReady {
divLabel := " diff "
if m.diffFocus {
divLabel = " diff (focused) "
}
divider := lipgloss.NewStyle().
Foreground(lipgloss.Color("238")).
Background(lipgloss.Color("236")).
Width(m.width).
Render(strings.Repeat("─", 4) + divLabel + strings.Repeat("─", max(0, m.width-4-len(divLabel))))

diffContent := m.diffVP.View()
diffBox := lipgloss.NewStyle().
Border(lipgloss.RoundedBorder()).
BorderForeground(lipgloss.Color("238")).
Padding(0, 0).
Render(diffContent)

contentSections = append(contentSections, divider, diffBox)
}
divider := lipgloss.NewStyle().
Foreground(lipgloss.Color("238")).
Background(lipgloss.Color("236")).
Width(m.width).
Render(strings.Repeat("─", 4) + divLabel + strings.Repeat("─", max(0, m.width-4-len(divLabel))))

diffContent := m.diffVP.View()
diffBox := lipgloss.NewStyle().
Border(lipgloss.RoundedBorder()).
BorderForeground(lipgloss.Color("238")).
Padding(0, 0).
Render(diffContent)

sections = append(sections, divider, diffBox)
}

sections = append(sections, footer)
content := lipgloss.JoinVertical(lipgloss.Left, sections...)
contentAbove := lipgloss.JoinVertical(lipgloss.Left, contentSections...)
contentHeight := strings.Count(contentAbove, "\n") + 1
footerHeight := strings.Count(footer, "\n") + 1
padLines := m.height - contentHeight - footerHeight
if padLines < 0 {
padLines = 0
}

allSections := append(contentSections, make([]string, padLines)...)
allSections = append(allSections, footer)
content := lipgloss.JoinVertical(lipgloss.Left, allSections...)

v := tea.NewView(content)
v.AltScreen = true
Expand Down
Loading