[#2258] hide options panel when showBottom line is disabled

1 files changed, 17 insertions, 21 deletions

diff --git a/pkg/gui/arrangement.go b/pkg/gui/arrangement.go
index 34004b1df..ac6f2d9c1 100644
--- a/pkg/gui/arrangement.go
+++ b/pkg/gui/arrangement.go
@@ -159,30 +159,26 @@ func (gui *Gui) infoSectionChildren(informationStr string, appStatus string) []*
 		}
 	}
 
-	result := []*boxlayout.Box{}
+	appStatusBox := &boxlayout.Box{Window: "appStatus"}
+	optionsBox := &boxlayout.Box{Window: "options"}
 
-	if len(appStatus) > 0 {
-		result = append(result,
-			&boxlayout.Box{
-				Window: "appStatus",
-				Size:   runewidth.StringWidth(appStatus) + runewidth.StringWidth(INFO_SECTION_PADDING),
-			},
-		)
+	if !gui.c.UserConfig.Gui.ShowBottomLine {
+		optionsBox.Weight = 0
+		appStatusBox.Weight = 1
+	} else {
+		optionsBox.Weight = 1
+		appStatusBox.Size = runewidth.StringWidth(INFO_SECTION_PADDING) + runewidth.StringWidth(appStatus)
 	}
 
-	result = append(result,
-		[]*boxlayout.Box{
-			{
-				Window: "options",
-				Weight: 1,
-			},
-			{
-				Window: "information",
-				// unlike appStatus, informationStr has various colors so we need to decolorise before taking the length
-				Size: runewidth.StringWidth(INFO_SECTION_PADDING) + runewidth.StringWidth(utils.Decolorise(informationStr)),
-			},
-		}...,
-	)
+	result := []*boxlayout.Box{appStatusBox, optionsBox}
+
+	if gui.c.UserConfig.Gui.ShowBottomLine || gui.isAnyModeActive() {
+		result = append(result, &boxlayout.Box{
+			Window: "information",
+			// unlike appStatus, informationStr has various colors so we need to decolorise before taking the length
+			Size: runewidth.StringWidth(INFO_SECTION_PADDING) + runewidth.StringWidth(utils.Decolorise(informationStr)),
+		})
+	}
 
 	return result
 }