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

Replace CurrentPopupContexts() with Context().CurrentPopup()

Browse source
This commit is contained in:
Stefan Haller 2024-08-08 10:34:06 +02:00
parent 3a8b97841f
commit f30387e7f5
4 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/gui/controllers/helpers/confirmation_helper.go
View file

@ -325,7 +325,7 @@ func (self *ConfirmationHelper) getSelectedSuggestionValue() string {
func (self *ConfirmationHelper) ResizeCurrentPopupPanels() {
var parentPopupContext types.Context
for _, c := range self.c.CurrentPopupContexts() {
for _, c := range self.c.Context().CurrentPopup() {
switch c {
case self.c.Contexts().Menu:
self.resizeMenu(parentPopupContext)

4
pkg/gui/gui_common.go
View file

@ -45,10 +45,6 @@ func (self *guiCommon) RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error) {
return self.gui.runSubprocessWithSuspense(cmdObj)
}
func (self *guiCommon) CurrentPopupContexts() []types.Context {
return self.gui.State.ContextMgr.CurrentPopup()
}
func (self *guiCommon) IsCurrentContext(c types.Context) bool {
return self.gui.State.ContextMgr.IsCurrent(c)
}

1
pkg/gui/types/common.go
View file

@ -57,7 +57,6 @@ type IGuiCommon interface {
RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error)
RunSubprocessAndRefresh(oscommands.ICmdObj) error
CurrentPopupContexts() []Context
IsCurrentContext(Context) bool
// TODO: replace the above context-based methods with just using Context() e.g. replace PushContext() with Context().Push()
Context() IContextMgr

1
pkg/gui/types/context.go
View file

@ -282,6 +282,7 @@ type IContextMgr interface {
Current() Context
CurrentStatic() Context
CurrentSide() Context
CurrentPopup() []Context
IsCurrent(c Context) bool
ForEach(func(Context))
AllList() []IListContext