i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorry, the previous commit also contained broken WIP stuff.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21678 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2007-07-21 19:22:53 +00:00
parent 0d32d905e9
commit 90c6c3e8a4
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermWindow.cpp
+13 -14
View File
@@ -171,7 +171,7 @@ TermWindow::InitWindow()
* TermView is character Terminal view on BaseView. It has paste * TermView is character Terminal view on BaseView. It has paste
* on BaseView shift as VIEW_OFFSET. * on BaseView shift as VIEW_OFFSET.
*/ */
//fBaseView = new TermBaseView(textframe, fTermView); fBaseView = new TermBaseView(textframe, fTermView);
// Initialize TermView. (font, size and color) // Initialize TermView. (font, size and color)
@@ -186,7 +186,7 @@ TermWindow::InitWindow()
MIN_COLS * height, MAX_COLS * height); MIN_COLS * height, MAX_COLS * height);
fTermView->SetTermColor(); fTermView->SetTermColor();
//fBaseView->SetViewColor(PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR)); fBaseView->SetViewColor(PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR));
// Add offset to baseview. // Add offset to baseview.
rect.InsetBy(-VIEW_OFFSET, -VIEW_OFFSET); rect.InsetBy(-VIEW_OFFSET, -VIEW_OFFSET);
@@ -196,9 +196,9 @@ TermWindow::InitWindow()
ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH, ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH,
rect.Height() + fMenubar->Bounds().Height()); rect.Height() + fMenubar->Bounds().Height());
//fBaseView->ResizeTo(rect.Width(), rect.Height()); fBaseView->ResizeTo(rect.Width(), rect.Height());
//fBaseView->AddChild(fTermView); fBaseView->AddChild(fTermView);
//fTermView->MoveBy(VIEW_OFFSET, VIEW_OFFSET); fTermView->MoveBy(VIEW_OFFSET, VIEW_OFFSET);
// Make Scroll Bar. // Make Scroll Bar.
@@ -212,9 +212,8 @@ TermWindow::InitWindow()
fTermView->SetScrollBar(scrollBar); fTermView->SetScrollBar(scrollBar);
AddChild(scrollBar); AddChild(scrollBar);
//AddChild(fBaseView); AddChild(fBaseView);
AddChild(fTermView);
// Set fEditmenu's target to fTermView. (Oh!...) // Set fEditmenu's target to fTermView. (Oh!...)
fEditmenu->SetTargetForItems(fTermView); fEditmenu->SetTargetForItems(fTermView);
@@ -554,8 +553,8 @@ TermWindow::MessageReceived(BMessage *message)
BScreen screen(this); BScreen screen(this);
fTermView->ScrollBar()->Hide(); fTermView->ScrollBar()->Hide();
fMenubar->Hide(); fMenubar->Hide();
fTermView->MoveTo(0,0); fBaseView->MoveTo(0,0);
fTermView->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight); fBaseView->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight);
fSavedLook = Look(); fSavedLook = Look();
// done before ResizeTo to work around a Dano bug (not erasing the decor) // done before ResizeTo to work around a Dano bug (not erasing the decor)
SetLook(B_NO_BORDER_WINDOW_LOOK); SetLook(B_NO_BORDER_WINDOW_LOOK);
@@ -567,8 +566,8 @@ TermWindow::MessageReceived(BMessage *message)
fTermView->ScrollBar()->Show(); fTermView->ScrollBar()->Show();
ResizeTo(fSavedFrame.Width(), fSavedFrame.Height()); ResizeTo(fSavedFrame.Width(), fSavedFrame.Height());
MoveTo(fSavedFrame.left, fSavedFrame.top); MoveTo(fSavedFrame.left, fSavedFrame.top);
fTermView->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight); fBaseView->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight);
fTermView->MoveTo(0,mbHeight); fBaseView->MoveTo(0,mbHeight);
SetLook(fSavedLook); SetLook(fSavedLook);
fSavedFrame = BRect(0,0,-1,-1); fSavedFrame = BRect(0,0,-1,-1);
} }
@@ -580,9 +579,9 @@ TermWindow::MessageReceived(BMessage *message)
break; break;
} }
case MSG_COLOR_CHANGED: { case MSG_COLOR_CHANGED: {
//fBaseView->SetViewColor (PrefHandler::Default()->getRGB (PREF_TEXT_BACK_COLOR)); fBaseView->SetViewColor (PrefHandler::Default()->getRGB (PREF_TEXT_BACK_COLOR));
fTermView->SetTermColor(); fTermView->SetTermColor();
//fBaseView->Invalidate(); fBaseView->Invalidate();
fTermView->Invalidate(); fTermView->Invalidate();
break; break;
} }