From d1ccf11502497d6e1fb027a6f36e41b7efa60576 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 10 Nov 2022 19:42:02 +1100 Subject: [PATCH] small refactor --- pkg/gui/panels/side_list_panel.go | 5 ++--- pkg/gui/view_helpers.go | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/gui/panels/side_list_panel.go b/pkg/gui/panels/side_list_panel.go index e8fe80fd..2473e2ce 100644 --- a/pkg/gui/panels/side_list_panel.go +++ b/pkg/gui/panels/side_list_panel.go @@ -69,8 +69,7 @@ type IGui interface { FocusY(selectedLine int, itemCount int, view *gocui.View) ShouldRefresh(contextKey string) bool GetMainView() *gocui.View - // TODO: replace with IsCurrentView() bool - CurrentView() *gocui.View + IsCurrentView(*gocui.View) bool FilterString(view *gocui.View) string IgnoreStrings() []string Update(func() error) @@ -242,7 +241,7 @@ func (self *SideListPanel[T]) RerenderList() error { } } - if self.View == self.Gui.CurrentView() { + if self.Gui.IsCurrentView(self.View) { return self.HandleSelect() } return nil diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 44042a0b..8ddae589 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -368,3 +368,7 @@ func (gui *Gui) allSidePanels() []panels.ISideListPanel { func (gui *Gui) allListPanels() []panels.ISideListPanel { return append(gui.allSidePanels(), gui.Panels.Menu) } + +func (gui *Gui) IsCurrentView(view *gocui.View) bool { + return view == gui.CurrentView() +}