mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-04 22:34:39 +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.
120 lines
2.8 KiB
Go
120 lines
2.8 KiB
Go
package context
|
|
|
|
import (
|
|
"math"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/sasha-s/go-deadlock"
|
|
)
|
|
|
|
type MergeConflictsContext struct {
|
|
types.Context
|
|
viewModel *ConflictsViewModel
|
|
c *ContextCommon
|
|
mutex *deadlock.Mutex
|
|
}
|
|
|
|
type ConflictsViewModel struct {
|
|
state *mergeconflicts.State
|
|
|
|
// userVerticalScrolling tells us if the user has started scrolling through the file themselves
|
|
// in which case we won't auto-scroll to a conflict.
|
|
userVerticalScrolling bool
|
|
}
|
|
|
|
func NewMergeConflictsContext(
|
|
c *ContextCommon,
|
|
) *MergeConflictsContext {
|
|
viewModel := &ConflictsViewModel{
|
|
state: mergeconflicts.NewState(),
|
|
userVerticalScrolling: false,
|
|
}
|
|
|
|
return &MergeConflictsContext{
|
|
viewModel: viewModel,
|
|
mutex: &deadlock.Mutex{},
|
|
Context: NewSimpleContext(
|
|
NewBaseContext(NewBaseContextOpts{
|
|
Kind: types.MAIN_CONTEXT,
|
|
View: c.Views().MergeConflicts,
|
|
WindowName: "main",
|
|
Key: MERGE_CONFLICTS_CONTEXT_KEY,
|
|
Focusable: true,
|
|
HighlightOnFocus: true,
|
|
}),
|
|
),
|
|
c: c,
|
|
}
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetState() *mergeconflicts.State {
|
|
return self.viewModel.state
|
|
}
|
|
|
|
func (self *MergeConflictsContext) SetState(state *mergeconflicts.State) {
|
|
self.viewModel.state = state
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetMutex() *deadlock.Mutex {
|
|
return self.mutex
|
|
}
|
|
|
|
func (self *MergeConflictsContext) SetUserScrolling(isScrolling bool) {
|
|
self.viewModel.userVerticalScrolling = isScrolling
|
|
}
|
|
|
|
func (self *MergeConflictsContext) IsUserScrolling() bool {
|
|
return self.viewModel.userVerticalScrolling
|
|
}
|
|
|
|
func (self *MergeConflictsContext) RenderAndFocus() {
|
|
self.setContent()
|
|
self.FocusSelection()
|
|
|
|
self.c.Render()
|
|
}
|
|
|
|
func (self *MergeConflictsContext) Render() error {
|
|
self.setContent()
|
|
|
|
self.c.Render()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetContentToRender() string {
|
|
if self.GetState() == nil {
|
|
return ""
|
|
}
|
|
|
|
return mergeconflicts.ColoredConflictFile(self.GetState())
|
|
}
|
|
|
|
func (self *MergeConflictsContext) setContent() {
|
|
self.GetView().SetContent(self.GetContentToRender())
|
|
}
|
|
|
|
func (self *MergeConflictsContext) FocusSelection() {
|
|
if !self.IsUserScrolling() {
|
|
self.GetView().SetOriginY(self.GetOriginY())
|
|
}
|
|
|
|
self.SetSelectedLineRange()
|
|
}
|
|
|
|
func (self *MergeConflictsContext) SetSelectedLineRange() {
|
|
startIdx, endIdx := self.GetState().GetSelectedRange()
|
|
view := self.GetView()
|
|
originY := view.OriginY()
|
|
// As far as the view is concerned, we are always selecting a range
|
|
view.SetRangeSelectStart(startIdx)
|
|
view.SetCursorY(endIdx - originY)
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetOriginY() int {
|
|
view := self.GetView()
|
|
conflictMiddle := self.GetState().GetConflictMiddle()
|
|
return int(math.Max(0, float64(conflictMiddle-(view.InnerHeight()/2))))
|
|
}
|