fixup! Layout the bottom line view using spacer views

Author: stefanhaller

pkg/gui/context/context.go

@@ -38,8 +38,6 @@ const (
 	LIMIT_CONTEXT_KEY          types.ContextKey = "limit"
 	STATUS_SPACER1_CONTEXT_KEY types.ContextKey = "statusSpacer1"
 	STATUS_SPACER2_CONTEXT_KEY types.ContextKey = "statusSpacer2"
-	STATUS_SPACER3_CONTEXT_KEY types.ContextKey = "statusSpacer3"
-	STATUS_SPACER4_CONTEXT_KEY types.ContextKey = "statusSpacer4"
 
 	MENU_CONTEXT_KEY               types.ContextKey = "menu"
 	CONFIRMATION_CONTEXT_KEY       types.ContextKey = "confirmation"
@@ -121,8 +119,6 @@ type ContextTree struct {
 	Limit         types.Context
 	StatusSpacer1 types.Context
 	StatusSpacer2 types.Context
-	StatusSpacer3 types.Context
-	StatusSpacer4 types.Context
 }
 
 // the order of this decides which context is initially at the top of its window
@@ -166,8 +162,6 @@ func (self *ContextTree) Flatten() []types.Context {
 		self.Limit,
 		self.StatusSpacer1,
 		self.StatusSpacer2,
-		self.StatusSpacer3,
-		self.StatusSpacer4,
 	}
 }
 

pkg/gui/context/setup.go

@@ -145,7 +145,5 @@ func NewContextTree(c *ContextCommon) *ContextTree {
 		Limit:         NewDisplayContext(LIMIT_CONTEXT_KEY, c.Views().Limit, "limit"),
 		StatusSpacer1: NewDisplayContext(STATUS_SPACER1_CONTEXT_KEY, c.Views().StatusSpacer1, "statusSpacer1"),
 		StatusSpacer2: NewDisplayContext(STATUS_SPACER2_CONTEXT_KEY, c.Views().StatusSpacer2, "statusSpacer2"),
-		StatusSpacer3: NewDisplayContext(STATUS_SPACER3_CONTEXT_KEY, c.Views().StatusSpacer3, "statusSpacer3"),
-		StatusSpacer4: NewDisplayContext(STATUS_SPACER4_CONTEXT_KEY, c.Views().StatusSpacer4, "statusSpacer4"),
 	}
 }

pkg/gui/controllers/helpers/window_arrangement_helper.go

@@ -266,8 +266,8 @@ func infoSectionChildren(args WindowArrangementArgs) []*boxlayout.Box {
 
 	statusSpacerPrefix := "statusSpacer"
 	spacerBoxIndex := 0
-	maxSpacerBoxIndex := 4 // See pkg/gui/types/views.go
-	// Returns a box with size 1 to be used as padding before, between, or after views
+	maxSpacerBoxIndex := 2 // See pkg/gui/types/views.go
+	// Returns a box with size 1 to be used as padding between views
 	spacerBox := func() *boxlayout.Box {
 		spacerBoxIndex++
 
@@ -278,7 +278,7 @@ func infoSectionChildren(args WindowArrangementArgs) []*boxlayout.Box {
 		return &boxlayout.Box{Window: fmt.Sprintf("%s%d", statusSpacerPrefix, spacerBoxIndex), Size: 1}
 	}
 
-	// Returns a box with weight 1 to be used as flexible padding before, between, or after views
+	// Returns a box with weight 1 to be used as flexible padding between views
 	flexibleSpacerBox := func() *boxlayout.Box {
 		spacerBoxIndex++
 
@@ -327,9 +327,11 @@ func infoSectionChildren(args WindowArrangementArgs) []*boxlayout.Box {
 
 	if len(result) == 2 && result[0].Window == "appStatus" {
 		// Only status and information are showing; need to insert a flexible
-		// spacer after the 1-width spacer between the two, so that information
-		// is right-aligned
-
+		// spacer between the two, so that information is right-aligned. Note
+		// that the call to insertSpacerBoxes below will still insert a 1-char
+		// spacer in addition (right after the flexible one); this is needed for
+		// the case that there's not enough room, to ensure there's always at
+		// least one space.
 		result = slices.Insert(result, 1, flexibleSpacerBox())
 	} else if len(result) == 1 {
 		if result[0].Window == "information" {

pkg/gui/types/views.go

@@ -36,8 +36,6 @@ type Views struct {
 	SearchPrefix      *gocui.View
 	StatusSpacer1     *gocui.View
 	StatusSpacer2     *gocui.View
-	StatusSpacer3     *gocui.View
-	StatusSpacer4     *gocui.View
 	Limit             *gocui.View
 	Suggestions       *gocui.View
 	Tooltip           *gocui.View

pkg/gui/views.go

@@ -55,11 +55,9 @@ func (gui *Gui) orderedViewNameMappings() []viewNameMapping {
 		{viewPtr: &gui.Views.Search, name: "search"},
 		// this view shows either the "Search:" prompt when searching, or the "Filter:" prompt when filtering
 		{viewPtr: &gui.Views.SearchPrefix, name: "searchPrefix"},
-		// these views all contain one space, and are used as spacers before, between, and after the various views in the bottom line
+		// these views contain one space, and are used as spacers between the various views in the bottom line
 		{viewPtr: &gui.Views.StatusSpacer1, name: "statusSpacer1"},
 		{viewPtr: &gui.Views.StatusSpacer2, name: "statusSpacer2"},
-		{viewPtr: &gui.Views.StatusSpacer3, name: "statusSpacer3"},
-		{viewPtr: &gui.Views.StatusSpacer4, name: "statusSpacer4"},
 
 		// popups.
 		{viewPtr: &gui.Views.CommitMessage, name: "commitMessage"},
@@ -105,8 +103,6 @@ func (gui *Gui) createAllViews() error {
 
 	gui.Views.StatusSpacer1.Frame = false
 	gui.Views.StatusSpacer2.Frame = false
-	gui.Views.StatusSpacer3.Frame = false
-	gui.Views.StatusSpacer4.Frame = false
 
 	gui.Views.Search.BgColor = gocui.ColorDefault
 	gui.Views.Search.FgColor = gocui.ColorCyan