mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 10:15:32 -05:00
Stefan Haller
3a3625d855
Convert the remaining *Alt/*Alt[12] sibling fields (PrevItem/NextItem, GotoTop/GotoBottom, PrevBlock/NextBlock, ScrollUpMain/ScrollDownMain, OptionMenu, ConfirmInEditor, DiffingMenu) so the merge mechanism folds their values into the corresponding main multi-key binding at config load. The redundant alt-only Binding registrations across the various controllers and the global keybindings file are gone: the merged main field already carries every key, so the for-loop in SetKeybinding registers them all.
94 lines
2.3 KiB
Go
94 lines
2.3 KiB
Go
package controllers
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type SideWindowControllerFactory struct {
|
|
c *ControllerCommon
|
|
}
|
|
|
|
func NewSideWindowControllerFactory(c *ControllerCommon) *SideWindowControllerFactory {
|
|
return &SideWindowControllerFactory{c: c}
|
|
}
|
|
|
|
func (self *SideWindowControllerFactory) Create(context types.Context) types.IController {
|
|
return NewSideWindowController(self.c, context)
|
|
}
|
|
|
|
type SideWindowController struct {
|
|
baseController
|
|
c *ControllerCommon
|
|
context types.Context
|
|
}
|
|
|
|
func NewSideWindowController(
|
|
c *ControllerCommon,
|
|
context types.Context,
|
|
) *SideWindowController {
|
|
return &SideWindowController{
|
|
baseController: baseController{},
|
|
c: c,
|
|
context: context,
|
|
}
|
|
}
|
|
|
|
func (self *SideWindowController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
|
return []*types.Binding{
|
|
{Keys: opts.GetKeys(opts.Config.Universal.PrevBlock), Handler: self.previousSideWindow},
|
|
{Keys: opts.GetKeys(opts.Config.Universal.NextBlock), Handler: self.nextSideWindow},
|
|
}
|
|
}
|
|
|
|
func (self *SideWindowController) Context() types.Context {
|
|
return nil
|
|
}
|
|
|
|
func (self *SideWindowController) previousSideWindow() error {
|
|
windows := self.c.Helpers().Window.SideWindows()
|
|
currentWindow := self.c.Helpers().Window.CurrentWindow()
|
|
var newWindow string
|
|
if currentWindow == "" || currentWindow == windows[0] {
|
|
newWindow = windows[len(windows)-1]
|
|
} else {
|
|
for i := range windows {
|
|
if currentWindow == windows[i] {
|
|
newWindow = windows[i-1]
|
|
break
|
|
}
|
|
if i == len(windows)-1 {
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
context := self.c.Helpers().Window.GetContextForWindow(newWindow)
|
|
|
|
self.c.Context().Push(context, types.OnFocusOpts{})
|
|
return nil
|
|
}
|
|
|
|
func (self *SideWindowController) nextSideWindow() error {
|
|
windows := self.c.Helpers().Window.SideWindows()
|
|
currentWindow := self.c.Helpers().Window.CurrentWindow()
|
|
var newWindow string
|
|
if currentWindow == "" || currentWindow == windows[len(windows)-1] {
|
|
newWindow = windows[0]
|
|
} else {
|
|
for i := range windows {
|
|
if currentWindow == windows[i] {
|
|
newWindow = windows[i+1]
|
|
break
|
|
}
|
|
if i == len(windows)-1 {
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
context := self.c.Helpers().Window.GetContextForWindow(newWindow)
|
|
|
|
self.c.Context().Push(context, types.OnFocusOpts{})
|
|
return nil
|
|
}
|