From 12ed50464b668a37644caaa78576a2faca3f8e5b Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sat, 17 May 2025 11:47:49 +0200 Subject: [PATCH] Cleanup: pass target context to focusMainView directly It's a bit silly to pass a window name and then call a function to get the corresponding context, when we can simply pass the context directly. --- .../switch_to_focused_main_view_controller.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/gui/controllers/switch_to_focused_main_view_controller.go b/pkg/gui/controllers/switch_to_focused_main_view_controller.go index cb03f5e15..3c08388b9 100644 --- a/pkg/gui/controllers/switch_to_focused_main_view_controller.go +++ b/pkg/gui/controllers/switch_to_focused_main_view_controller.go @@ -60,19 +60,18 @@ func (self *SwitchToFocusedMainViewController) Context() types.Context { } func (self *SwitchToFocusedMainViewController) onClickMain(opts gocui.ViewMouseBindingOpts) error { - return self.focusMainView("main") + return self.focusMainView(self.c.Contexts().Normal) } func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error { - return self.focusMainView("secondary") + return self.focusMainView(self.c.Contexts().NormalSecondary) } func (self *SwitchToFocusedMainViewController) handleFocusMainView() error { - return self.focusMainView("main") + return self.focusMainView(self.c.Contexts().Normal) } -func (self *SwitchToFocusedMainViewController) focusMainView(mainViewName string) error { - mainViewContext := self.c.Helpers().Window.GetContextForWindow(mainViewName) +func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context) error { mainViewContext.SetParentContext(self.context) if context, ok := mainViewContext.(types.ISearchableContext); ok { context.ClearSearchString()