From b6f9f38a7f35ac1cd2c3fc18111fc948030c95a5 Mon Sep 17 00:00:00 2001
From: Ryan Leavengood <leavengood@gmail.com>
Date: Sun, 16 Sep 2007 18:51:59 +0000
Subject: [PATCH] Applied patch from Bek of the HOST team: allow the Terminal
 to be resized to one line.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22236 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/terminal/TermConst.h    |  2 ++
 src/apps/terminal/TermWindow.cpp | 27 +++++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/apps/terminal/TermConst.h b/src/apps/terminal/TermConst.h
index b225f97bdf..c97b0c35c2 100644
--- a/src/apps/terminal/TermConst.h
+++ b/src/apps/terminal/TermConst.h
@@ -141,6 +141,8 @@ enum{
 
 #define MIN_COLS 10
 #define MAX_COLS 256
+#define MIN_ROWS 1
+#define MAX_ROWS 256
 
 // Insert mode flag
 #define MODE_OVER 0
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index b6b030620a..4a34398192 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -389,8 +389,14 @@ TermWindow::MessageReceived(BMessage *message)
 			int width, height;
 			_ActiveTermView()->GetFontSize(&width, &height);
 			
+			float minimumHeight = 0;
+			if (fMenubar)
+				minimumHeight += fMenubar->Bounds().Height();
+			if (fTabView && fTabView->CountTabs() > 1)
+				minimumHeight += fTabView->TabHeight();
 			SetSizeLimits (MIN_COLS * width, MAX_COLS * width,
-							MIN_COLS * height, MAX_COLS * height);
+							minimumHeight + MIN_ROWS * height, 
+							minimumHeight + MAX_ROWS * height);
 			
 			ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
 				rect.Height()+fMenubar->Bounds().Height() + kViewOffset * 2);
@@ -623,13 +629,22 @@ TermWindow::_AddTab(Arguments *args)
 		
 		_SetTermColors(view);
 		
-		// If it's the first time we're called, setup the window
-		if (fTabView->CountTabs() == 1) {
+		if (fTabView->CountTabs() >= 1) {
 			int width, height;
 			view->GetFontSize(&width, &height);
-			SetSizeLimits(MIN_COLS * width, MAX_COLS * width,
-				MIN_COLS * height, MAX_COLS * height);
-		
+
+			float minimumHeight = 0;
+			if (fMenubar)
+				minimumHeight += fMenubar->Bounds().Height();
+			if (fTabView && fTabView->CountTabs() > 1)
+				minimumHeight += fTabView->TabHeight();
+			SetSizeLimits (MIN_COLS * width, MAX_COLS * width,
+							minimumHeight + MIN_ROWS * height, 
+							minimumHeight + MAX_ROWS * height);
+		}
+
+		// If it's the first time we're called, setup the window
+		if (fTabView->CountTabs() == 1) {
 			float fWidth, fHeight;
 			view->GetPreferredSize(&fWidth, &fHeight);