From db5b3a02498ddee474ae2ab4e78aa629e8f68aff Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Thu, 9 Aug 2007 10:35:08 +0000
Subject: [PATCH] TermWindow didn't set the colors correctly on Terminals in a
 new tab. Now TermWindow::_SetTermColors() accepts a pointer to a TermView to
 fix that. Spotted by Andrea Bernardi. Thanks!

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

diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index cd893489c3..f32b98e189 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -441,7 +441,7 @@ TermWindow::MessageReceived(BMessage *message)
 			break;
 		
 		case MSG_COLOR_CHANGED:
-			_SetTermColors();
+			_SetTermColors(_ActiveTermView());
 			_ActiveTermView()->Invalidate();
 			break;
 		
@@ -487,15 +487,15 @@ TermWindow::QuitRequested()
 
 
 void
-TermWindow::_SetTermColors()
+TermWindow::_SetTermColors(TermView *termView)
 {
-	_ActiveTermView()->SetTextColor(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR),
+	termView->SetTextColor(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR));
 
-	_ActiveTermView()->SetSelectColor(PrefHandler::Default()->getRGB(PREF_SELECT_FORE_COLOR),
+	termView->SetSelectColor(PrefHandler::Default()->getRGB(PREF_SELECT_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_SELECT_BACK_COLOR));
 	
-	_ActiveTermView()->SetCursorColor(PrefHandler::Default()->getRGB(PREF_CURSOR_FORE_COLOR),
+	termView->SetCursorColor(PrefHandler::Default()->getRGB(PREF_CURSOR_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_CURSOR_BACK_COLOR));
 }
 
@@ -600,7 +600,7 @@ TermWindow::_AddTab(const char *command)
 	view->SetEncoding(longname2id(PrefHandler::Default()->getString(PREF_TEXT_ENCODING)));
 	view->SetTermFont(&halfFont, &fullFont);
 	
-	_SetTermColors();
+	_SetTermColors(view);
 	
 	// If it's the first time we're called, setup the window
 	if (fTabView->CountTabs() == 1) {
diff --git a/src/apps/terminal/TermWindow.h b/src/apps/terminal/TermWindow.h
index 5cec4dec08..407b60b8d8 100644
--- a/src/apps/terminal/TermWindow.h
+++ b/src/apps/terminal/TermWindow.h
@@ -54,7 +54,7 @@ protected:
 
 
 private:
-	void		_SetTermColors();
+	void		_SetTermColors(TermView *termView);
 	void		_InitWindow(const char *command);
 	void		_SetupMenu();
 	status_t	_DoPageSetup();