mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
f6f2a52dee
Original commit message of the gocui change:
This fixes View.Size, Width and Height to be the correct (outer) size of a view
including its frame, and InnerSize/InnerWidth/InnerHeight to be the usable
client area exluding the frame. Previously, Size was actually the InnerSize (and
a lot of client code used it as such, so these need to be changed to InnerSize).
InnerSize, on the other hand, was *one* less than Size (not two, as you would
have expected), and in many cases this was made up for at call sites by adding 1
(e.g. in calcRealScrollbarStartEnd, parseInput, and many other places in the
lazygit code).
There are still some weird things left that I didn't address here:
- a view's lower-right coordinates (x1/y1) are one less than you would expect.
For example, a view with a 2x2 client area like this:
╭──╮
│ab│
│cd│
╰──╯
in the top-left corner of the screen (x0 and y0 both zero) has x1/xy at 3, not
4 as would be more natural.
- a view without a frame has its coordinates extended by 1 on all sides; to
illustrate, the same 2x2 view as before but without a frame, sitting in the
top-left corder of the screen, has coordinates x0=-1, y0=-1, x1=2, y1=2. This
is highly confusing and unexpected.
I left these as they are because they would be even more of a breaking change,
and also because they don't have quite as much of an impact on general app code.
86 lines
2.1 KiB
Go
86 lines
2.1 KiB
Go
package context
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type BranchesContext struct {
|
|
*FilteredListViewModel[*models.Branch]
|
|
*ListContextTrait
|
|
}
|
|
|
|
var (
|
|
_ types.IListContext = (*BranchesContext)(nil)
|
|
_ types.DiffableContext = (*BranchesContext)(nil)
|
|
)
|
|
|
|
func NewBranchesContext(c *ContextCommon) *BranchesContext {
|
|
viewModel := NewFilteredListViewModel(
|
|
func() []*models.Branch { return c.Model().Branches },
|
|
func(branch *models.Branch) []string {
|
|
return []string{branch.Name}
|
|
},
|
|
)
|
|
|
|
getDisplayStrings := func(_ int, _ int) [][]string {
|
|
return presentation.GetBranchListDisplayStrings(
|
|
viewModel.GetItems(),
|
|
c.State().GetItemOperation,
|
|
c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
|
|
c.Modes().Diffing.Ref,
|
|
c.Views().Branches.InnerWidth(),
|
|
c.Tr,
|
|
c.UserConfig(),
|
|
c.Model().Worktrees,
|
|
)
|
|
}
|
|
|
|
self := &BranchesContext{
|
|
FilteredListViewModel: viewModel,
|
|
ListContextTrait: &ListContextTrait{
|
|
Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
|
|
View: c.Views().Branches,
|
|
WindowName: "branches",
|
|
Key: LOCAL_BRANCHES_CONTEXT_KEY,
|
|
Kind: types.SIDE_CONTEXT,
|
|
Focusable: true,
|
|
NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_WIDTH_CHANGES,
|
|
})),
|
|
ListRenderer: ListRenderer{
|
|
list: viewModel,
|
|
getDisplayStrings: getDisplayStrings,
|
|
},
|
|
c: c,
|
|
},
|
|
}
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *BranchesContext) GetSelectedRef() types.Ref {
|
|
branch := self.GetSelected()
|
|
if branch == nil {
|
|
return nil
|
|
}
|
|
return branch
|
|
}
|
|
|
|
func (self *BranchesContext) GetDiffTerminals() []string {
|
|
// for our local branches we want to include both the branch and its upstream
|
|
branch := self.GetSelected()
|
|
if branch != nil {
|
|
names := []string{branch.ID()}
|
|
if branch.IsTrackingRemote() {
|
|
names = append(names, branch.ID()+"@{u}")
|
|
}
|
|
return names
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (self *BranchesContext) ShowBranchHeadsInSubCommits() bool {
|
|
return true
|
|
}
|