mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 d8d8634e5e
commit 4cf8d11783
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

@ -91,6 +91,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.otherContext.SetParentContext(self.context.GetParentContext()) self.otherContext.SetParentContext(self.context.GetParentContext())

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.
@ -60,23 +61,31 @@ 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("main") return self.focusMainView("main", opts.Y)
} }
func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error { func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error {
return self.focusMainView("secondary") return self.focusMainView("secondary", opts.Y)
} }
func (self *SwitchToFocusedMainViewController) handleFocusMainView() error { func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {
return self.focusMainView("main") return self.focusMainView("main", -1)
} }
func (self *SwitchToFocusedMainViewController) focusMainView(mainViewName string) error { func (self *SwitchToFocusedMainViewController) focusMainView(mainViewName string, clickedViewLineIdx int) error {
mainViewContext := self.c.Helpers().Window.GetContextForWindow(mainViewName) mainViewContext := self.c.Helpers().Window.GetContextForWindow(mainViewName)
mainViewContext.SetParentContext(self.context) mainViewContext.SetParentContext(self.context)
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: mainViewName}
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
} }