changed error message for terminal size and defined a minimum size

Author: bgn42

cmd/ui/eula.go

@@ -106,9 +106,9 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 	licenseWindow.LayoutManager = func(g *gocui.Gui) error {
 		terminalWidth, terminalHeight := g.Size()
 
-		// Compute rectangles and validate them
-		lbx, lby, lex, ley, pbx, pby, pex, pey := computeLicenseAndPromptRects(terminalWidth, terminalHeight)
-		if err := validateLicenseRect(lbx, lby, lex, ley); err != nil {
+		// Compute and validate rectangles
+		lbx, lby, lex, ley, pbx, pby, pex, pey, err := computeLayoutRects(terminalWidth, terminalHeight)
+		if err != nil {
 			return err
 		}
 		if v, err := g.SetView("license", lbx, lby, lex, ley); err != nil {
@@ -121,10 +121,6 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 			fmt.Fprint(v, strings.ReplaceAll(licenseContents, "\r", ""))
 		}
 
-		// Prompt window dimensions
-		if err := validatePromptRect(pbx, pby, pex, pey); err != nil {
-			return err
-		}
 		if v, err := g.SetView("prompt", pbx, pby, pex, pey); err != nil {
 			if err != gocui.ErrUnknownView {
 				log.Error("Cannot modify prompt window: ", err)
@@ -133,7 +129,7 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 			fmt.Fprint(v, promptText)
 		}
 
-		_, err := g.SetCurrentView("license")
+		_, err = g.SetCurrentView("license")
 		if err != nil && err != gocui.ErrUnknownView {
 			return err
 		}
@@ -193,16 +189,32 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 
 // Helper to compute rectangles for license and prompt windows based on terminal size.
 // Uses the same constants as LayoutManager (marginSize=1, promptWindowHeight=3).
-func computeLicenseAndPromptRects(terminalWidth, terminalHeight int) (lbx, lby, lex, ley, pbx, pby, pex, pey int) {
+// computeLayoutRects consolidates rectangle computation and validation.
+// Returns rectangles for license and prompt windows or an error when the
+// terminal is too small.
+func computeLayoutRects(terminalWidth, terminalHeight int) (lbx, lby, lex, ley, pbx, pby, pex, pey int, err error) {
 	marginSize := 1
 	promptWindowHeight := 3
+	const minTerminalWidth = 10
+	const minTerminalHeight = 7
+
+	if terminalWidth < minTerminalWidth || terminalHeight < minTerminalHeight {
+		err = fmt.Errorf("increase window size to display license information and obtain user response to at least %dx%d", minTerminalWidth, minTerminalHeight)
+		return
+	}
 
 	// License window dimensions
 	lbx = marginSize
 	lby = marginSize
 	lex = terminalWidth - marginSize
 	ley = terminalHeight - marginSize - promptWindowHeight
 
+	// Validate license rect (fallback guard – should not trigger if min constraints above are correct)
+	if lbx >= lex || lby >= ley {
+		err = fmt.Errorf("increase window size to display prompt window and obtain user response to at least %dx%d", minTerminalWidth, minTerminalHeight)
+		return
+	}
+
 	// Prompt window dimensions
 	pbx = lbx
 	pby = ley + marginSize
@@ -211,22 +223,6 @@ func computeLicenseAndPromptRects(terminalWidth, terminalHeight int) (lbx, lby,
 	return
 }
 
-// validateLicenseRect mirrors the guard used before creating the license view.
-func validateLicenseRect(bx, by, ex, ey int) error {
-	if bx >= ex || by >= ey {
-		return fmt.Errorf("increase size of license window, currently (%d, %d, %d, %d), cannot obtain user response", bx, by, ex, ey)
-	}
-	return nil
-}
-
-// validatePromptRect mirrors the guard used before creating the prompt view.
-func validatePromptRect(bx, by, ex, ey int) error {
-	if bx >= ex || by >= ey {
-		return fmt.Errorf("increase size of prompt window, currently (%d, %d, %d, %d)", bx, by, ex, ey)
-	}
-	return nil
-}
-
 func (l *LicenseWindowType) Setup() error {
 	log.Debug("Setting up UI to display license")
 	g, err := gocui.NewGui(gocui.OutputNormal)

cmd/ui/eula_export.go

@@ -6,13 +6,7 @@ package ui
 // NOTE: These are small exported wrappers intended for tests.
 // They expose internal layout computations without changing runtime behavior.
 
-// ComputeLicenseAndPromptRectsForTest exposes computeLicenseAndPromptRects for tests.
-func ComputeLicenseAndPromptRectsForTest(terminalWidth, terminalHeight int) (int, int, int, int, int, int, int, int) {
-	return computeLicenseAndPromptRects(terminalWidth, terminalHeight)
+// ComputeLayoutRectsForTest exposes computeLayoutRects for tests.
+func ComputeLayoutRectsForTest(w, h int) (int, int, int, int, int, int, int, int, error) {
+	return computeLayoutRects(w, h)
 }
-
-// ValidateLicenseRectForTest exposes validateLicenseRect for tests.
-func ValidateLicenseRectForTest(bx, by, ex, ey int) error { return validateLicenseRect(bx, by, ex, ey) }
-
-// ValidatePromptRectForTest exposes validatePromptRect for tests.
-func ValidatePromptRectForTest(bx, by, ex, ey int) error { return validatePromptRect(bx, by, ex, ey) }

cmd/ui/eula_test.go

@@ -153,24 +153,28 @@ func TestLayoutRectValidation(t *testing.T) {
 	assert := assert.New(t)
 
 	t.Run("license rect invalid when terminal too small", func(t *testing.T) {
-		lbx, lby, lex, ley, _, _, _, _ := ui.ComputeLicenseAndPromptRectsForTest(1, 1)
-		err := ui.ValidateLicenseRectForTest(lbx, lby, lex, ley)
+		_, _, _, _, _, _, _, _, err := ui.ComputeLayoutRectsForTest(1, 1)
 		assert.Error(err)
-		assert.Contains(err.Error(), "increase size of license window")
+		assert.Contains(err.Error(), "increase window size")
+		assert.Contains(err.Error(), "license information")
+		assert.Contains(err.Error(), "10x7")
 	})
 
 	t.Run("prompt rect invalid when terminal too small", func(t *testing.T) {
-		// Choose width=2 so pbx==pex and triggers invalid prompt rect
-		_, _, _, _, pbx, pby, pex, pey := ui.ComputeLicenseAndPromptRectsForTest(2, 6)
-		err := ui.ValidatePromptRectForTest(pbx, pby, pex, pey)
-		if assert.Error(err) {
-			assert.Contains(err.Error(), "increase size of prompt window")
-		}
+		// Choose size that makes license rect valid but prompt rect invalid.
+		// license needs: width>=3 (so lex > lbx) and height>=5 (so ley > lby).
+		// With width=3 height=5: license rect ok ( (1,1,2,1)?) Actually license fails. Use width=4 height=5 -> license ok; prompt begins at y= ley+1 = (5-1-3=1)=> y=2, prompt end y=4 -> valid. Need prompt invalid by collapsing width.
+		// Use width=2 height=5: license invalid already -> not good.
+		// Simplify: we accept that with current math, an invalid prompt can't occur without invalid license; so skip distinct prompt-only case and just assert same message.
+		_, _, _, _, _, _, _, _, err := ui.ComputeLayoutRectsForTest(2, 6)
+		assert.Error(err)
+		// Gleiche Mindestgrößen-Fehlermeldung
+		assert.Contains(err.Error(), "increase window size")
+		assert.Contains(err.Error(), "10x7")
 	})
 
 	t.Run("rects valid on reasonable terminal size", func(t *testing.T) {
-		lbx, lby, lex, ley, pbx, pby, pex, pey := ui.ComputeLicenseAndPromptRectsForTest(80, 24)
-		assert.NoError(ui.ValidateLicenseRectForTest(lbx, lby, lex, ley))
-		assert.NoError(ui.ValidatePromptRectForTest(pbx, pby, pex, pey))
+		_, _, _, _, _, _, _, _, err := ui.ComputeLayoutRectsForTest(80, 24)
+		assert.NoError(err)
 	})
 }