Add ContextMgr.NextInStack and use it to access side panel of focused main view

stefanhaller · stefanhaller · commit 40f80928d726 · 2025-05-22T08:26:09.000+02:00
This way we don't have to abuse the parent context mechanism, which isn't meant
for this purpose.
diff --git a/pkg/gui/context.go b/pkg/gui/context.go
@@ -357,3 +357,19 @@ func (self *ContextMgr) CurrentPopup() []types.Context {
 		return context.GetKind() == types.TEMPORARY_POPUP || context.GetKind() == types.PERSISTENT_POPUP
 	})
 }
+
+func (self *ContextMgr) NextInStack(c types.Context) types.Context {
+	self.RLock()
+	defer self.RUnlock()
+
+	for i := range self.ContextStack {
+		if self.ContextStack[i].GetKey() == c.GetKey() {
+			if i == 0 {
+				return nil
+			}
+			return self.ContextStack[i-1]
+		}
+	}
+
+	panic("context not in stack")
+}
diff --git a/pkg/gui/controllers/context_lines_controller.go b/pkg/gui/controllers/context_lines_controller.go
@@ -131,7 +131,9 @@ func (self *ContextLinesController) currentSidePanel() types.Context {
 	currentContext := self.c.Context().CurrentStatic()
 	if currentContext.GetKey() == context.NORMAL_MAIN_CONTEXT_KEY ||
 		currentContext.GetKey() == context.NORMAL_SECONDARY_CONTEXT_KEY {
-		return currentContext.GetParentContext()
+		if sidePanelContext := self.c.Context().NextInStack(currentContext); sidePanelContext != nil {
+			return sidePanelContext
+		}
 	}
 
 	return currentContext
diff --git a/pkg/gui/controllers/main_view_controller.go b/pkg/gui/controllers/main_view_controller.go
@@ -76,7 +76,6 @@ func (self *MainViewController) Context() types.Context {
 
 func (self *MainViewController) togglePanel() error {
 	if self.otherContext.GetView().Visible {
-		self.otherContext.SetParentContext(self.context.GetParentContext())
 		self.c.Context().Push(self.otherContext, types.OnFocusOpts{})
 	}
 
@@ -89,15 +88,14 @@ func (self *MainViewController) escape() error {
 }
 
 func (self *MainViewController) onClickInAlreadyFocusedView(opts gocui.ViewMouseBindingOpts) error {
-	parentCtx := self.context.GetParentContext()
-	if parentCtx.GetOnClickFocusedMainView() != nil {
-		return parentCtx.GetOnClickFocusedMainView()(self.context.GetViewName(), opts.Y)
+	sidePanelContext := self.c.Context().NextInStack(self.context)
+	if sidePanelContext != nil && sidePanelContext.GetOnClickFocusedMainView() != nil {
+		return sidePanelContext.GetOnClickFocusedMainView()(self.context.GetViewName(), opts.Y)
 	}
 	return nil
 }
 
 func (self *MainViewController) onClickInOtherViewOfMainViewPair(opts gocui.ViewMouseBindingOpts) error {
-	self.context.SetParentContext(self.otherContext.GetParentContext())
 	self.c.Context().Push(self.context, types.OnFocusOpts{
 		ClickedWindowName:  self.context.GetWindowName(),
 		ClickedViewLineIdx: opts.Y,
diff --git a/pkg/gui/controllers/rename_similarity_threshold_controller.go b/pkg/gui/controllers/rename_similarity_threshold_controller.go
@@ -106,7 +106,9 @@ func (self *RenameSimilarityThresholdController) currentSidePanel() types.Contex
 	currentContext := self.c.Context().CurrentStatic()
 	if currentContext.GetKey() == context.NORMAL_MAIN_CONTEXT_KEY ||
 		currentContext.GetKey() == context.NORMAL_SECONDARY_CONTEXT_KEY {
-		return currentContext.GetParentContext()
+		if sidePanelContext := self.c.Context().NextInStack(currentContext); sidePanelContext != nil {
+			return sidePanelContext
+		}
 	}
 
 	return currentContext
diff --git a/pkg/gui/controllers/switch_to_focused_main_view_controller.go b/pkg/gui/controllers/switch_to_focused_main_view_controller.go
@@ -72,7 +72,6 @@ func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {
 }
 
 func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context) error {
-	mainViewContext.SetParentContext(self.context)
 	if context, ok := mainViewContext.(types.ISearchableContext); ok {
 		context.ClearSearchString()
 	}
diff --git a/pkg/gui/types/context.go b/pkg/gui/types/context.go
@@ -300,6 +300,7 @@ type IContextMgr interface {
 	CurrentStatic() Context
 	CurrentSide() Context
 	CurrentPopup() []Context
+	NextInStack(context Context) Context
 	IsCurrent(c Context) bool
 	IsCurrentOrParent(c Context) bool
 	ForEach(func(Context))
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
@@ -152,9 +152,9 @@ func (gui *Gui) postRefreshUpdate(c types.Context) {
 			// just don't rerender the view while searching, on the assumption that users will probably
 			// either search or change their data, but not both at the same time.
 			if !currentCtx.GetView().IsSearching() {
-				parentCtx := currentCtx.GetParentContext()
-				if parentCtx.GetKey() == c.GetKey() {
-					parentCtx.HandleRenderToMain()
+				sidePanelContext := gui.State.ContextMgr.NextInStack(currentCtx)
+				if sidePanelContext != nil && sidePanelContext.GetKey() == c.GetKey() {
+					sidePanelContext.HandleRenderToMain()
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ func (self *MainViewController) Context() types.Context {`
`76`	`76`
`77`	`77`	`func (self *MainViewController) togglePanel() error {`
`78`	`78`	`if self.otherContext.GetView().Visible {`
`79`		`- self.otherContext.SetParentContext(self.context.GetParentContext())`
`80`	`79`	`self.c.Context().Push(self.otherContext, types.OnFocusOpts{})`
`81`	`80`	`}`
`82`	`81`
`@@ -89,15 +88,14 @@ func (self *MainViewController) escape() error {`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`func (self *MainViewController) onClickInAlreadyFocusedView(opts gocui.ViewMouseBindingOpts) error {`
`92`		`- parentCtx := self.context.GetParentContext()`
`93`		`- if parentCtx.GetOnClickFocusedMainView() != nil {`
`94`		`- return parentCtx.GetOnClickFocusedMainView()(self.context.GetViewName(), opts.Y)`
	`91`	`+ sidePanelContext := self.c.Context().NextInStack(self.context)`
	`92`	`+ if sidePanelContext != nil && sidePanelContext.GetOnClickFocusedMainView() != nil {`
	`93`	`+ return sidePanelContext.GetOnClickFocusedMainView()(self.context.GetViewName(), opts.Y)`
`95`	`94`	`}`
`96`	`95`	`return nil`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`func (self *MainViewController) onClickInOtherViewOfMainViewPair(opts gocui.ViewMouseBindingOpts) error {`
`100`		`- self.context.SetParentContext(self.otherContext.GetParentContext())`
`101`	`99`	`self.c.Context().Push(self.context, types.OnFocusOpts{`
`102`	`100`	`ClickedWindowName: self.context.GetWindowName(),`
`103`	`101`	`ClickedViewLineIdx: opts.Y,`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context) error {`
`75`		`- mainViewContext.SetParentContext(self.context)`
`76`	`75`	`if context, ok := mainViewContext.(types.ISearchableContext); ok {`
`77`	`76`	`context.ClearSearchString()`
`78`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,9 @@ func (gui *Gui) postRefreshUpdate(c types.Context) {`
`152`	`152`	`// just don't rerender the view while searching, on the assumption that users will probably`
`153`	`153`	`// either search or change their data, but not both at the same time.`
`154`	`154`	`if !currentCtx.GetView().IsSearching() {`
`155`		`- parentCtx := currentCtx.GetParentContext()`
`156`		`- if parentCtx.GetKey() == c.GetKey() {`
`157`		`- parentCtx.HandleRenderToMain()`
	`155`	`+ sidePanelContext := gui.State.ContextMgr.NextInStack(currentCtx)`
	`156`	`+ if sidePanelContext != nil && sidePanelContext.GetKey() == c.GetKey() {`
	`157`	`+ sidePanelContext.HandleRenderToMain()`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`	`}`