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

pkg/gui/controllers/helpers/confirmation_helper.go

@@ -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)

pkg/gui/gui_common.go

@@ -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)
 }

pkg/gui/types/common.go

@@ -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

pkg/gui/types/context.go

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