From 90c6c3e8a4af497dbf1e70b78c7f57255e2f8cb0 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 21 Jul 2007 19:22:53 +0000 Subject: [PATCH] Sorry, the previous commit also contained broken WIP stuff. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21678 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/terminal/TermWindow.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index a6d5645e06..775ede05d6 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -171,7 +171,7 @@ TermWindow::InitWindow() * TermView is character Terminal view on BaseView. It has paste * on BaseView shift as VIEW_OFFSET. */ - //fBaseView = new TermBaseView(textframe, fTermView); + fBaseView = new TermBaseView(textframe, fTermView); // Initialize TermView. (font, size and color) @@ -186,7 +186,7 @@ TermWindow::InitWindow() MIN_COLS * height, MAX_COLS * height); fTermView->SetTermColor(); - //fBaseView->SetViewColor(PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR)); + fBaseView->SetViewColor(PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR)); // Add offset to baseview. rect.InsetBy(-VIEW_OFFSET, -VIEW_OFFSET); @@ -196,9 +196,9 @@ TermWindow::InitWindow() ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH, rect.Height() + fMenubar->Bounds().Height()); - //fBaseView->ResizeTo(rect.Width(), rect.Height()); - //fBaseView->AddChild(fTermView); - //fTermView->MoveBy(VIEW_OFFSET, VIEW_OFFSET); + fBaseView->ResizeTo(rect.Width(), rect.Height()); + fBaseView->AddChild(fTermView); + fTermView->MoveBy(VIEW_OFFSET, VIEW_OFFSET); // Make Scroll Bar. @@ -212,9 +212,8 @@ TermWindow::InitWindow() fTermView->SetScrollBar(scrollBar); AddChild(scrollBar); - //AddChild(fBaseView); - AddChild(fTermView); - + AddChild(fBaseView); + // Set fEditmenu's target to fTermView. (Oh!...) fEditmenu->SetTargetForItems(fTermView); @@ -554,8 +553,8 @@ TermWindow::MessageReceived(BMessage *message) BScreen screen(this); fTermView->ScrollBar()->Hide(); fMenubar->Hide(); - fTermView->MoveTo(0,0); - fTermView->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight); + fBaseView->MoveTo(0,0); + fBaseView->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight); fSavedLook = Look(); // done before ResizeTo to work around a Dano bug (not erasing the decor) SetLook(B_NO_BORDER_WINDOW_LOOK); @@ -567,8 +566,8 @@ TermWindow::MessageReceived(BMessage *message) fTermView->ScrollBar()->Show(); ResizeTo(fSavedFrame.Width(), fSavedFrame.Height()); MoveTo(fSavedFrame.left, fSavedFrame.top); - fTermView->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight); - fTermView->MoveTo(0,mbHeight); + fBaseView->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight); + fBaseView->MoveTo(0,mbHeight); SetLook(fSavedLook); fSavedFrame = BRect(0,0,-1,-1); } @@ -580,9 +579,9 @@ TermWindow::MessageReceived(BMessage *message) break; } case MSG_COLOR_CHANGED: { - //fBaseView->SetViewColor (PrefHandler::Default()->getRGB (PREF_TEXT_BACK_COLOR)); + fBaseView->SetViewColor (PrefHandler::Default()->getRGB (PREF_TEXT_BACK_COLOR)); fTermView->SetTermColor(); - //fBaseView->Invalidate(); + fBaseView->Invalidate(); fTermView->Invalidate(); break; }