more standardisation of rendering

1 files changed, 16 insertions, 10 deletions

diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go
index ef98b98e6..d37fb8dea 100644
--- a/pkg/gui/global_handlers.go
+++ b/pkg/gui/global_handlers.go
@@ -9,15 +9,23 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
+// 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 (gui *Gui) viewsWithScreenModeDependentContent() []string {
+	return []string{"branches", "commits"}
+}
+
 func (gui *Gui) nextScreenMode(g *gocui.Gui, v *gocui.View) error {
 	gui.State.ScreenMode = utils.NextIntInCycle([]int{SCREEN_NORMAL, SCREEN_HALF, SCREEN_FULL}, gui.State.ScreenMode)
 	// commits render differently depending on whether we're in fullscreen more or not
 	if err := gui.refreshCommitsViewWithSelection(); err != nil {
 		return err
 	}
-	// same with branches
-	if err := gui.refreshBranchesViewWithSelection(); err != nil {
-		return err
+
+	for _, viewName := range gui.viewsWithScreenModeDependentContent() {
+		if err := gui.rerenderView(viewName); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -25,13 +33,11 @@ func (gui *Gui) nextScreenMode(g *gocui.Gui, v *gocui.View) error {
 
 func (gui *Gui) prevScreenMode(g *gocui.Gui, v *gocui.View) error {
 	gui.State.ScreenMode = utils.PrevIntInCycle([]int{SCREEN_NORMAL, SCREEN_HALF, SCREEN_FULL}, gui.State.ScreenMode)
-	// commits render differently depending on whether we're in fullscreen more or not
-	if err := gui.refreshCommitsViewWithSelection(); err != nil {
-		return err
-	}
-	// same with branches
-	if err := gui.refreshBranchesViewWithSelection(); err != nil {
-		return err
+
+	for _, viewName := range gui.viewsWithScreenModeDependentContent() {
+		if err := gui.rerenderView(viewName); err != nil {
+			return err
+		}
 	}
 
 	return nil