Skip to content

add support to dynamically adjust file tree width #148

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

Open
TLINDEN wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add support to dynamically adjust file tree width #148

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions pkg/ui/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ type KeyMap struct {
ToggleHelp key.Binding
ToggleMessage key.Binding
ToggleSelection key.Binding
IncreaseFileTreeWidth key.Binding
DecreaseFileTreeWidth key.Binding
}

var keys = &KeyMap{
Expand Down Expand Up @@ -156,6 +158,14 @@ var keys = &KeyMap{
key.WithKeys("v"),
key.WithHelp("v", "toggle selection"),
),
IncreaseFileTreeWidth: key.NewBinding(
key.WithKeys(">"),
key.WithHelp(">", "increase file tree width"),
),
DecreaseFileTreeWidth: key.NewBinding(
key.WithKeys("<"),
key.WithHelp("<", "decrease file tree width"),
),
}

func KeyGroups() [][]key.Binding {
Expand All @@ -171,6 +181,8 @@ func KeyGroups() [][]key.Binding {
keys.CtrlU,
keys.ScrollLeft,
keys.ScrollRight,
keys.IncreaseFileTreeWidth,
keys.DecreaseFileTreeWidth,
}, {
keys.ToggleFileTree,
keys.SearchFiles,
Expand Down
23 changes: 18 additions & 5 deletions pkg/ui/panes/filetree/filetree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,15 @@ import (
"github.com/dlvhdr/diffnav/pkg/utils"
)

const (
widthStep = 5
)

type Model struct {
t tree.Model
files []*gitdiff.File
cfg config.Config
t tree.Model
files []*gitdiff.File
cfg config.Config
currentWidth int
}

func New(cfg config.Config) Model {
Expand Down Expand Up @@ -59,6 +64,12 @@ func (m *Model) Update(msg tea.Msg) (*Model, tea.Cmd) {

case key.Matches(msg, keys.ToggleNode):
m.t.ToggleCurrentNode()

case key.Matches(msg, keys.IncreaseFileTreeWidth):
m.SetSize(m.Width()+widthStep, 0)

case key.Matches(msg, keys.DecreaseFileTreeWidth):
m.SetSize(m.Width()-widthStep, 0)
}
}
return m, nil
Expand Down Expand Up @@ -411,8 +422,10 @@ var indenter = func(children ltree.Children, index int) string {

// SetSize implements the Component interface.
func (m *Model) SetSize(width, height int) {
m.t.SetSize(width, height)
m.rebuildTree()
if width > 0 {
m.t.SetSize(width, height)
m.rebuildTree()
}
}

func (m *Model) Width() int {
Expand Down
16 changes: 13 additions & 3 deletions pkg/ui/panes/filetree/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package filetree
import "charm.land/bubbles/v2/key"

type KeyMap struct {
ExpandNode key.Binding
CollapseNode key.Binding
ToggleNode key.Binding
ExpandNode key.Binding
CollapseNode key.Binding
ToggleNode key.Binding
IncreaseFileTreeWidth key.Binding
DecreaseFileTreeWidth key.Binding
}

var keys = &KeyMap{
Expand All @@ -21,4 +23,12 @@ var keys = &KeyMap{
key.WithKeys("enter"),
key.WithHelp("enter", "toggle"),
),
IncreaseFileTreeWidth: key.NewBinding(
key.WithKeys(">"),
key.WithHelp(">", "increase file tree width"),
),
DecreaseFileTreeWidth: key.NewBinding(
key.WithKeys("<"),
key.WithHelp("<", "decrease file tree width"),
),
}