diff --git a/pkg/gui/context/list_context_trait.go b/pkg/gui/context/list_context_trait.go index bce3ae344..db95cf2b7 100644 --- a/pkg/gui/context/list_context_trait.go +++ b/pkg/gui/context/list_context_trait.go @@ -49,7 +49,7 @@ func (self *ListContextTrait) FocusLine() { } else if self.renderOnlyVisibleLines { newOrigin, _ := self.GetViewTrait().ViewPortYBounds() if oldOrigin != newOrigin { - return self.HandleRender() + self.HandleRender() } } return nil @@ -91,7 +91,7 @@ func (self *ListContextTrait) HandleFocusLost(opts types.OnFocusLostOpts) error } // OnFocus assumes that the content of the context has already been rendered to the view. OnRender is the function which actually renders the content to the view -func (self *ListContextTrait) HandleRender() error { +func (self *ListContextTrait) HandleRender() { self.list.ClampSelection() if self.renderOnlyVisibleLines { // Rendering only the visible area can save a lot of cell memory for @@ -110,8 +110,6 @@ func (self *ListContextTrait) HandleRender() error { } self.c.Render() self.setFooter() - - return nil } func (self *ListContextTrait) OnSearchSelect(selectedLineIdx int) error { diff --git a/pkg/gui/context/simple_context.go b/pkg/gui/context/simple_context.go index 8e63fe988..d6079aa32 100644 --- a/pkg/gui/context/simple_context.go +++ b/pkg/gui/context/simple_context.go @@ -60,8 +60,7 @@ func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) error { return nil } -func (self *SimpleContext) HandleRender() error { - return nil +func (self *SimpleContext) HandleRender() { } func (self *SimpleContext) HandleRenderToMain() error { diff --git a/pkg/gui/context/suggestions_context.go b/pkg/gui/context/suggestions_context.go index c741cc769..9e3b8ba95 100644 --- a/pkg/gui/context/suggestions_context.go +++ b/pkg/gui/context/suggestions_context.go @@ -70,7 +70,7 @@ func (self *SuggestionsContext) SetSuggestions(suggestions []*types.Suggestion) self.State.Suggestions = suggestions self.SetSelection(0) self.c.ResetViewOrigin(self.GetView()) - _ = self.HandleRender() + self.HandleRender() } func (self *SuggestionsContext) RefreshSuggestions() { diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index d22e56f1c..a046c3b77 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -734,9 +734,7 @@ func (self *BranchesController) rename(branch *models.Branch) error { for i, newBranch := range self.c.Model().Branches { if newBranch.Name == newBranchName { self.context().SetSelection(i) - if err := self.context().HandleRender(); err != nil { - return err - } + self.context().HandleRender() } } diff --git a/pkg/gui/controllers/helpers/confirmation_helper.go b/pkg/gui/controllers/helpers/confirmation_helper.go index 1d30aa611..523e99da4 100644 --- a/pkg/gui/controllers/helpers/confirmation_helper.go +++ b/pkg/gui/controllers/helpers/confirmation_helper.go @@ -366,7 +366,7 @@ func (self *ConfirmationHelper) layoutMenuPrompt(contentWidth int) int { // We need to rerender to give the menu context a chance to update its // non-model items, and reinitialize the data it uses for converting // between view index and model index. - _ = self.c.Contexts().Menu.HandleRender() + self.c.Contexts().Menu.HandleRender() // Then we need to refocus to ensure the cursor is in the right place in // the view. diff --git a/pkg/gui/controllers/helpers/inline_status_helper.go b/pkg/gui/controllers/helpers/inline_status_helper.go index cc9da86ea..2e1cf29e0 100644 --- a/pkg/gui/controllers/helpers/inline_status_helper.go +++ b/pkg/gui/controllers/helpers/inline_status_helper.go @@ -151,7 +151,7 @@ func (self *InlineStatusHelper) stop(opts InlineStatusOpts) { func (self *InlineStatusHelper) renderContext(contextKey types.ContextKey) { self.c.OnUIThread(func() error { - _ = self.c.ContextForKey(contextKey).HandleRender() + self.c.ContextForKey(contextKey).HandleRender() return nil }) } diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 01be0d267..4df0e4190 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -469,9 +469,7 @@ func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSele }, func() { self.c.OnUIThread(func() error { - if err := self.c.Contexts().Branches.HandleRender(); err != nil { - self.c.Log.Error(err) - } + self.c.Contexts().Branches.HandleRender() self.refreshStatus() return nil }) @@ -504,9 +502,7 @@ func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSele // Need to re-render the commits view because the visualization of local // branch heads might have changed self.c.Mutexes().LocalCommitsMutex.Lock() - if err := self.c.Contexts().LocalCommits.HandleRender(); err != nil { - self.c.Log.Error(err) - } + self.c.Contexts().LocalCommits.HandleRender() self.c.Mutexes().LocalCommitsMutex.Unlock() self.refreshStatus() diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go index 067688307..c0eaeef40 100644 --- a/pkg/gui/controllers/helpers/refs_helper.go +++ b/pkg/gui/controllers/helpers/refs_helper.go @@ -78,7 +78,7 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions // offer to autostash changes self.c.OnUIThread(func() error { // (Before showing the prompt, render again to remove the inline status) - _ = self.c.Contexts().Branches.HandleRender() + self.c.Contexts().Branches.HandleRender() return self.c.Confirm(types.ConfirmOpts{ Title: self.c.Tr.AutoStashTitle, Prompt: self.c.Tr.AutoStashPrompt, diff --git a/pkg/gui/controllers/list_controller.go b/pkg/gui/controllers/list_controller.go index 7e51c504d..f16d06083 100644 --- a/pkg/gui/controllers/list_controller.go +++ b/pkg/gui/controllers/list_controller.go @@ -54,7 +54,7 @@ func (self *ListController) HandleScrollUp() error { scrollHeight := self.c.UserConfig().Gui.ScrollHeight self.context.GetViewTrait().ScrollUp(scrollHeight) if self.context.RenderOnlyVisibleLines() { - return self.context.HandleRender() + self.context.HandleRender() } return nil @@ -64,7 +64,7 @@ func (self *ListController) HandleScrollDown() error { scrollHeight := self.c.UserConfig().Gui.ScrollHeight self.context.GetViewTrait().ScrollDown(scrollHeight) if self.context.RenderOnlyVisibleLines() { - return self.context.HandleRender() + self.context.HandleRender() } return nil diff --git a/pkg/gui/controllers/screen_mode_actions.go b/pkg/gui/controllers/screen_mode_actions.go index 2d0026793..2d4b1c8d0 100644 --- a/pkg/gui/controllers/screen_mode_actions.go +++ b/pkg/gui/controllers/screen_mode_actions.go @@ -17,7 +17,8 @@ func (self *ScreenModeActions) Next() error { ), ) - return self.rerenderViewsWithScreenModeDependentContent() + self.rerenderViewsWithScreenModeDependentContent() + return nil } func (self *ScreenModeActions) Prev() error { @@ -28,31 +29,28 @@ func (self *ScreenModeActions) Prev() error { ), ) - return self.rerenderViewsWithScreenModeDependentContent() + self.rerenderViewsWithScreenModeDependentContent() + return nil } // these views need to be re-rendered when the screen mode changes. The commits view, // for example, will show authorship information in half and full screen mode. -func (self *ScreenModeActions) rerenderViewsWithScreenModeDependentContent() error { +func (self *ScreenModeActions) rerenderViewsWithScreenModeDependentContent() { for _, context := range self.c.Context().AllList() { if context.NeedsRerenderOnWidthChange() == types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES { - if err := self.rerenderView(context.GetView()); err != nil { - return err - } + self.rerenderView(context.GetView()) } } - - return nil } -func (self *ScreenModeActions) rerenderView(view *gocui.View) error { +func (self *ScreenModeActions) rerenderView(view *gocui.View) { context, ok := self.c.Helpers().View.ContextForView(view.Name()) if !ok { self.c.Log.Errorf("no context found for view %s", view.Name()) - return nil + return } - return context.HandleRender() + context.HandleRender() } func nextIntInCycle(sl []types.WindowMaximisation, current types.WindowMaximisation) types.WindowMaximisation { diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index 9c477be8e..3a362dd2a 100644 --- a/pkg/gui/controllers/tags_controller.go +++ b/pkg/gui/controllers/tags_controller.go @@ -223,7 +223,7 @@ func (self *TagsController) push(tag *models.Tag) error { // Render again to remove the inline status: self.c.OnUIThread(func() error { - _ = self.c.Contexts().Tags.HandleRender() + self.c.Contexts().Tags.HandleRender() return nil }) diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go index 03cd07b60..f55f46ff4 100644 --- a/pkg/gui/layout.go +++ b/pkg/gui/layout.go @@ -177,9 +177,7 @@ func (gui *Gui) layout(g *gocui.Gui) error { } for _, context := range contextsToRerender { - if err := context.HandleRender(); err != nil { - return err - } + context.HandleRender() } // here is a good place log some stuff diff --git a/pkg/gui/types/context.go b/pkg/gui/types/context.go index cacdb8564..4882ddba6 100644 --- a/pkg/gui/types/context.go +++ b/pkg/gui/types/context.go @@ -105,7 +105,7 @@ type Context interface { HandleFocus(opts OnFocusOpts) error HandleFocusLost(opts OnFocusLostOpts) error - HandleRender() error + HandleRender() HandleRenderToMain() error } diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 725aee750..167c83f39 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -131,9 +131,7 @@ func (gui *Gui) postRefreshUpdate(c types.Context) error { gui.Log.Infof("postRefreshUpdate for %s took %s", c.GetKey(), time.Since(t)) }() - if err := c.HandleRender(); err != nil { - return err - } + c.HandleRender() if gui.currentViewName() == c.GetViewName() { if err := c.HandleFocus(types.OnFocusOpts{}); err != nil {