lots of changes

1 files changed, 15 insertions, 7 deletions

diff --git a/pkg/gui/gui_common.go b/pkg/gui/gui_common.go
index e4b8b3981..7c26c655d 100644
--- a/pkg/gui/gui_common.go
+++ b/pkg/gui/gui_common.go
@@ -41,31 +41,35 @@ func (self *guiCommon) RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error) {
 }
 
 func (self *guiCommon) PushContext(context types.Context, opts ...types.OnFocusOpts) error {
-	return self.gui.pushContext(context, opts...)
+	return self.gui.State.ContextMgr.Push(context, opts...)
 }
 
 func (self *guiCommon) PopContext() error {
-	return self.gui.popContext()
+	return self.gui.State.ContextMgr.Pop()
 }
 
 func (self *guiCommon) ReplaceContext(context types.Context) error {
-	return self.gui.replaceContext(context)
+	return self.gui.State.ContextMgr.Replace(context)
 }
 
 func (self *guiCommon) CurrentContext() types.Context {
-	return self.gui.currentContext()
+	return self.gui.State.ContextMgr.Current()
 }
 
 func (self *guiCommon) CurrentStaticContext() types.Context {
-	return self.gui.currentStaticContext()
+	return self.gui.State.ContextMgr.CurrentStatic()
 }
 
 func (self *guiCommon) CurrentSideContext() types.Context {
-	return self.gui.currentSideContext()
+	return self.gui.State.ContextMgr.CurrentSide()
 }
 
 func (self *guiCommon) IsCurrentContext(c types.Context) bool {
-	return self.CurrentContext().GetKey() == c.GetKey()
+	return self.gui.State.ContextMgr.IsCurrent(c)
+}
+
+func (self *guiCommon) Context() types.IContextMgr {
+	return self.gui.State.ContextMgr
 }
 
 func (self *guiCommon) GetAppState() *config.AppState {
@@ -148,3 +152,7 @@ func (self *guiCommon) State() types.IStateAccessor {
 func (self *guiCommon) KeybindingsOpts() types.KeybindingsOpts {
 	return self.gui.keybindingOpts()
 }
+
+func (self *guiCommon) IsAnyModeActive() bool {
+	return self.IsAnyModeActive()
+}