go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-30 23:57:43 +02:00
Code Issues Releases Activity

Select line that is in the middle of the screen

Browse Source
This commit is contained in:
Stefan Haller
2025-03-25 15:01:16 +01:00
parent 4976bb32ac
commit f1807f635d
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/controllers/main_view_controller.go
View File

@@ -87,6 +87,14 @@ func (self *MainViewController) Context() types.Context {
return self.context return self.context
} }
func (self *MainViewController) GetOnFocus() func(types.OnFocusOpts) {
return func(opts types.OnFocusOpts) {
if opts.ClickedWindowName != "" {
self.context.GetView().FocusPoint(0, opts.ClickedViewLineIdx)
}
}
}
func (self *MainViewController) togglePanel() error { func (self *MainViewController) togglePanel() error {
if self.otherContext.GetView().Visible { if self.otherContext.GetView().Visible {
self.c.Context().Push(self.otherContext, types.OnFocusOpts{}) self.c.Context().Push(self.otherContext, types.OnFocusOpts{})

19
pkg/gui/controllers/switch_to_focused_main_view_controller.go
View File

@@ -3,6 +3,7 @@ package controllers
import ( import (
"github.com/jesseduffield/gocui" "github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/samber/lo"
) )
// This controller is for all contexts that can focus their main view. // This controller is for all contexts that can focus their main view.
@@ -61,21 +62,29 @@ func (self *SwitchToFocusedMainViewController) Context() types.Context {
} }
func (self *SwitchToFocusedMainViewController) onClickMain(opts gocui.ViewMouseBindingOpts) error { func (self *SwitchToFocusedMainViewController) onClickMain(opts gocui.ViewMouseBindingOpts) error {
return self.focusMainView(self.c.Contexts().Normal) return self.focusMainView(self.c.Contexts().Normal, opts.Y)
} }
func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error { func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error {
return self.focusMainView(self.c.Contexts().NormalSecondary) return self.focusMainView(self.c.Contexts().NormalSecondary, opts.Y)
} }
func (self *SwitchToFocusedMainViewController) handleFocusMainView() error { func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {
return self.focusMainView(self.c.Contexts().Normal) return self.focusMainView(self.c.Contexts().Normal, -1)
} }
func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context) error { func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context, clickedViewLineIdx int) error {
if context, ok := mainViewContext.(types.ISearchableContext); ok { if context, ok := mainViewContext.(types.ISearchableContext); ok {
context.ClearSearchString() context.ClearSearchString()
} }
self.c.Context().Push(mainViewContext, types.OnFocusOpts{}) onFocusOpts := types.OnFocusOpts{ClickedWindowName: mainViewContext.GetWindowName()}
if clickedViewLineIdx >= 0 {
onFocusOpts.ClickedViewLineIdx = clickedViewLineIdx
} else {
mainView := mainViewContext.GetView()
lineIdx := mainView.OriginY() + mainView.Height()/2
onFocusOpts.ClickedViewLineIdx = lo.Clamp(lineIdx, 0, mainView.LinesHeight()-1)
}
self.c.Context().Push(mainViewContext, onFocusOpts)
return nil return nil
} }