Merge pull request #570 from navidys/container_exec_dialog_size

Container exec terminal size change
containers · Mar 2, 2025 · bce001c · bce001c
2 parents 84cc728 + eed5fd9
commit bce001c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ui/containers/cntdialogs/vterm/vterm.go b/ui/containers/cntdialogs/vterm/vterm.go
@@ -118,7 +118,7 @@ func (d *VtermDialog) initLayoutUI() {
 	layout.SetBackgroundColor(bgColor)
 	layout.SetBorder(false)
 	layout.AddItem(d.containerInfo, 1, 0, true)
-	layout.AddItem(utils.EmptyBoxSpace(bgColor), 1, 0, true)
+	// layout.AddItem(utils.EmptyBoxSpace(bgColor), 1, 0, true)
 	layout.AddItem(d.termScreen, 0, 1, true)
 
 	termLayout.SetBackgroundColor(bgColor)
@@ -132,7 +132,7 @@ func (d *VtermDialog) initLayoutUI() {
 	d.layout.SetBorder(true)
 	d.layout.SetBorderColor(borderColor)
 	d.layout.SetBackgroundColor(bgColor)
-	d.layout.SetTitle("CONTAINER TERMINAL")
+	// d.layout.SetTitle("CONTAINER TERMINAL")
 
 	d.layout.AddItem(termLayout, 0, 1, true)
 	d.layout.AddItem(d.form, dialogs.DialogFormHeight, 0, true)
@@ -404,7 +404,7 @@ func (d *VtermDialog) SetSessionID(id string) {
 		id = id[0:utils.IDLength]
 	}
 
-	sessionIDLabel := fmt.Sprintf("SESSION (%s)", id)
+	sessionIDLabel := fmt.Sprintf("TERMINAL SESSION (%s)", id)
 	d.termScreen.SetTitle(sessionIDLabel)
 }
 

diff --git a/ui/containers/draw.go b/ui/containers/draw.go
@@ -10,13 +10,13 @@ func (cnt *Containers) Draw(screen tcell.Screen) { //nolint:cyclop
 	cnt.Box.DrawForSubclass(screen, cnt)
 	cnt.Box.SetBorder(false)
 
-	x, y, width, height := cnt.GetInnerRect()
+	cntViewX, cntViewY, cntViewW, cntViewH := cnt.GetInnerRect()
 
-	cnt.table.SetRect(x, y, width, height)
+	cnt.table.SetRect(cntViewX, cntViewY, cntViewW, cntViewH)
 	cnt.table.SetBorder(true)
 	cnt.table.Draw(screen)
 
-	x, y, width, height = cnt.table.GetInnerRect()
+	x, y, width, height := cnt.table.GetInnerRect()
 
 	// error dialog
 	if cnt.errorDialog.IsDisplay() {
@@ -121,7 +121,7 @@ func (cnt *Containers) Draw(screen tcell.Screen) { //nolint:cyclop
 
 	// terminal dialog
 	if cnt.terminalDialog.IsDisplay() {
-		cnt.terminalDialog.SetRect(x, y, width, height)
+		cnt.terminalDialog.SetRect(cntViewX, cntViewY, cntViewW, cntViewH)
 		cnt.terminalDialog.Draw(screen)
 
 		return