I have successfully refactored createModal across the entire codebase to accept DialogSizeConstraints and perform fully dynamic size calculations on every draw.

  ### Summary of Changes:

  1. Dynamic Modal Resizing: Updated  createModal  inside util.go to receive  DialogSizeConstraints  directly instead of raw dimensions. Every time a modal draws, it recalculates its ideal dimensions
  using  CalculateDialogSize(constraints)  and resizes its inner frames dynamically.
  2. Eliminated Call-site Redundancy: Migrated all callers of  createModal  to pass constraints directly, allowing them to skip manual one-time  CalculateDialogSize  pre-calculations. This applies to:
      • column_selection_dialog.go
      • file_diff_dialog.go
      • help_dialog.go
      • restore_file_progress_dialog.go
      • selection_dialog.go
      • util_test.go
  3. Verified and Built: Ran  go test ./...  and compiled the final clean binary using  just build .

  Now, all modals and dialogs throughout the application dynamically scale up or down during terminal resizing events.

Author: markusressel

internal/ui/dialog/column_selection_dialog.go

@@ -110,13 +110,11 @@ func (d *ColumnSelectionDialog) createLayout() {
 	extraWidth := 2 * (maxColWidth + 4)
 	staticHeight := 1 + len(d.allColumns) + 2
 
-	width, height := CalculateDialogSize(DialogSizeConstraints{
+	d.layout = createModal(d.title, content, DialogSizeConstraints{
 		Title:             d.title,
 		ExtraContentWidth: extraWidth,
 		StaticHeight:      staticHeight,
 	})
-
-	d.layout = createModal(d.title, content, width, height)
 	d.layout.SetInputCapture(d.captureInput)
 }
 

internal/ui/dialog/file_diff_dialog.go

@@ -69,13 +69,11 @@ func (d *FileDiffDialog) createLayout() {
 	dialogContent.AddItem(closeTextView, 1, 0, false)
 	dialogContent.SetBorderPadding(0, 0, 1, 1)
 
-	width, height := CalculateDialogSize(DialogSizeConstraints{
+	dialog := createModal(dialogTitle, dialogContent, DialogSizeConstraints{
 		Title:             dialogTitle,
 		ExtraContentWidth: 74,
 		StaticHeight:      18, // Sane content height for scrollable diff text
 	})
-
-	dialog := createModal(dialogTitle, dialogContent, width, height)
 	dialog.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 		if event.Key() == tcell.KeyEscape {
 			d.Close()

internal/ui/dialog/file_history_overlay.go

@@ -339,22 +339,7 @@ func (o *FileHistoryOverlay) createLayout() *tview.Flex {
 		AddItem(dialogContentRowWrapper, width, 1, true).
 		AddItem(nil, 0, 1, false)
 
-	dialogContentColumnWrapper.SetDrawFunc(func(screen tcell.Screen, x, y, width, height int) (int, int, int, int) {
-		screenWidth, screenHeight := screen.Size()
-		newWidth := screenWidth - 4
-		if newWidth < 80 {
-			newWidth = 80
-		}
-		newHeight := screenHeight - 2
-		if newHeight < 15 {
-			newHeight = 15
-		}
-
-		dialogContentColumnWrapper.ResizeItem(dialogContentRowWrapper, newWidth, 1)
-		dialogContentRowWrapper.ResizeItem(dialogFrame, newHeight, 1)
-
-		return x, y, width, height
-	})
+	MakeFlexResizing(dialogContentColumnWrapper, dialogContentRowWrapper, dialogFrame, 99999, 80, 99999, 15)
 
 	return dialogContentColumnWrapper
 }

internal/ui/dialog/help_dialog.go

@@ -70,13 +70,11 @@ func (p *HelpPage) createLayout() {
 	maxHelpWidth := maxKeyWidth + 1 + maxValueWidth
 
 	title := " ℹ️ Help "
-	width, height := CalculateDialogSize(DialogSizeConstraints{
+	p.layout = createModal(title, helpTable, DialogSizeConstraints{
 		Title:             title,
 		ExtraContentWidth: maxHelpWidth,
 		StaticHeight:      len(helpTableEntries),
 	})
-
-	p.layout = createModal(title, helpTable, width, height)
 }
 
 func setHelpTableRow(helpTable *tview.Table, row int, entry *TableEntry) {

internal/ui/dialog/restore_file_progress_dialog.go

@@ -112,13 +112,11 @@ func (d *RestoreFileProgressDialog) createLayout() {
 		AddItem(actionPages, 1, 0, false)
 	progressLayout.SetBorderPadding(0, 0, 1, 1)
 
-	width, height := CalculateDialogSize(DialogSizeConstraints{
+	dialog := createModal(dialogTitle, progressLayout, DialogSizeConstraints{
 		Title:        dialogTitle,
 		Description:  text,
 		StaticHeight: 4, // 3 for progress bar, 1 for actionPages
 	})
-
-	dialog := createModal(dialogTitle, progressLayout, width, height)
 	dialog.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 		if event.Key() == tcell.KeyEscape {
 			d.Close()

internal/ui/dialog/selection_dialog.go

@@ -78,12 +78,14 @@ func (d *SelectionDialog) createLayout() {
 		}
 	}
 
-	dialogWidth, dialogHeight := CalculateDialogSize(DialogSizeConstraints{
+	constraints := DialogSizeConstraints{
 		Title:             d.title,
 		Description:       d.description,
 		ExtraContentWidth: maxOptWidth,
 		StaticHeight:      1 + actualTableRows,
-	})
+	}
+
+	dialogWidth, _ := CalculateDialogSize(constraints)
 
 	textLineWidth := dialogWidth - 6
 	if textLineWidth < 5 {
@@ -103,7 +105,7 @@ func (d *SelectionDialog) createLayout() {
 	dialogContent.AddItem(tview.NewBox(), 1, 0, false)
 	dialogContent.AddItem(d.optionTable, actualTableRows, 0, true)
 
-	dialog := createModal(d.title, dialogContent, dialogWidth, dialogHeight)
+	dialog := createModal(d.title, dialogContent, constraints)
 	dialog.SetInputCapture(createOptionDialogInputCapture(d.optionTable, d.options, d.selectAction, d.Close))
 	d.layout = dialog
 }

internal/ui/dialog/util.go

@@ -64,8 +64,41 @@ func buildConfirmDialogOptions(
 	return options
 }
 
+// MakeFlexResizing registers a SetDrawFunc resize handler on columnWrapper
+// to dynamically resize rowWrapper and dialogFrame based on terminal size and constraints.
+func MakeFlexResizing(
+	columnWrapper *tview.Flex,
+	rowWrapper *tview.Flex,
+	dialogFrame *tview.Flex,
+	targetWidth, minWidth int,
+	targetHeight, minHeight int,
+) {
+	columnWrapper.SetDrawFunc(func(screen tcell.Screen, x, y, width, height int) (int, int, int, int) {
+		screenWidth, screenHeight := screen.Size()
+		w := targetWidth
+		if w > screenWidth-4 {
+			w = screenWidth - 4
+		}
+		if w < minWidth {
+			w = minWidth
+		}
+		h := targetHeight
+		if h > screenHeight-2 {
+			h = screenHeight - 2
+		}
+		if h < minHeight {
+			h = minHeight
+		}
+
+		columnWrapper.ResizeItem(rowWrapper, w, 1)
+		rowWrapper.ResizeItem(dialogFrame, h, 1)
+
+		return x, y, width, height
+	})
+}
+
 // createModal creates a [tview.Flex] layout for a modal dialog with the given title and content.
-func createModal(title string, content tview.Primitive, width int, height int) *tview.Flex {
+func createModal(title string, content tview.Primitive, constraints DialogSizeConstraints) *tview.Flex {
 	dialogFrame := tview.NewFlex()
 	dialogFrame.SetBorder(true)
 	uiutil.SetupDialogWindow(dialogFrame, title)
@@ -76,13 +109,20 @@ func createModal(title string, content tview.Primitive, width int, height int) *
 
 	dialogContentRowWrapper := tview.NewFlex().SetDirection(tview.FlexRow).
 		AddItem(nil, 0, 1, false).
-		AddItem(dialogFrame, height, 1, true).
+		AddItem(dialogFrame, 0, 1, true).
 		AddItem(nil, 0, 1, false)
 
 	dialogContentColumnWrapper.
-		AddItem(dialogContentRowWrapper, width, 1, true).
+		AddItem(dialogContentRowWrapper, 0, 1, true).
 		AddItem(nil, 0, 1, false)
 
+	dialogContentColumnWrapper.SetDrawFunc(func(screen tcell.Screen, x, y, width, height int) (int, int, int, int) {
+		w, h := CalculateDialogSize(constraints)
+		dialogContentColumnWrapper.ResizeItem(dialogContentRowWrapper, w, 1)
+		dialogContentRowWrapper.ResizeItem(dialogFrame, h, 1)
+		return x, y, width, height
+	})
+
 	return dialogContentColumnWrapper
 }
 

internal/ui/dialog/util_test.go

@@ -10,7 +10,10 @@ import (
 
 func TestCreateModal(t *testing.T) {
 	content := tview.NewBox()
-	dialog := createModal("Test Modal", content, 50, 15)
+	dialog := createModal("Test Modal", content, DialogSizeConstraints{
+		Title:        "Test Modal",
+		StaticHeight: 15,
+	})
 	assert.NotNil(t, dialog)
 }