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

view experimentation, do not include debugger.h

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4271 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2003-08-10 17:38:30 +00:00
parent 3349a7ac9d
commit cd600cf798
1 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TerminalWindow.cpp
+45 -14
View File
@@ -1,16 +1,19 @@
#include <stdlib.h> #include <stdlib.h>
#include <Alert.h> #include <Alert.h>
#include <Autolock.h> #include <Autolock.h>
#include <Debug.h>
#include <Clipboard.h> #include <Clipboard.h>
#include <Debug.h>
#include <Dragger.h>
#include <File.h> #include <File.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <Menu.h> #include <Menu.h>
#include <MenuItem.h> #include <MenuItem.h>
#include <OS.h>
#include <Path.h> #include <Path.h>
#include <PrintJob.h> #include <PrintJob.h>
#include <Roster.h> #include <Roster.h>
#include <ScrollView.h> #include <ScrollView.h>
#include <Shelf.h>
#include <StorageDefs.h> #include <StorageDefs.h>
#include <String.h> #include <String.h>
#include <TextControl.h> #include <TextControl.h>
@@ -21,7 +24,6 @@
#include <TerminalApp.h> #include <TerminalApp.h>
#include <TerminalWindow.h> #include <TerminalWindow.h>
#include <debugger.h>
BRect terminalWindowBounds(0,0,560,390); BRect terminalWindowBounds(0,0,560,390);
@@ -56,6 +58,12 @@ TerminalWindow::InitCheck(void)
status_t status_t
TerminalWindow::InitWindow(int32 id, entry_ref * settingsRef) TerminalWindow::InitWindow(int32 id, entry_ref * settingsRef)
{ {
BView * view = new BView(Bounds(),"view",B_FOLLOW_ALL, B_FRAME_EVENTS|B_WILL_DRAW);
AddChild(view);
rgb_color white = {255,255,255,0};
view->SetViewColor(white);
BShelf * shelf = new BShelf(view);
status_t ignore = RestoreSettings(settingsRef); status_t ignore = RestoreSettings(settingsRef);
BString unTitled; BString unTitled;
@@ -68,22 +76,45 @@ TerminalWindow::InitWindow(int32 id, entry_ref * settingsRef)
AddChild(fMenuBar); AddChild(fMenuBar);
// Add textview and scrollview // Add shell view and scroll view
BRect viewFrame; BRect shellFrame;
BRect textBounds; shellFrame.top = fMenuBar->Bounds().Height();
shellFrame.right = Bounds().Width() - B_V_SCROLL_BAR_WIDTH;
shellFrame.left = 0;
shellFrame.bottom = Bounds().Height();
viewFrame = Bounds(); fShellView = new BView(shellFrame,"shellview",B_FOLLOW_ALL, B_FRAME_EVENTS|B_WILL_DRAW);
rgb_color red = {170,80,80,0};
fShellView->SetViewColor(red);
viewFrame.top = fMenuBar->Bounds().Height()+1; if (BDragger::AreDraggersDrawn()) {
viewFrame.right -= B_V_SCROLL_BAR_WIDTH; fShellView->ResizeBy(0,-8);
viewFrame.left = 0; }
fShellView = new BView(viewFrame,"shellview",B_FOLLOW_ALL, B_FRAME_EVENTS|B_WILL_DRAW);
fShellView->SetLowColor(170,45,45);
fScrollView = new BScrollView("scrollview", fShellView, B_FOLLOW_ALL, fScrollView = new BScrollView("scrollview", fShellView, B_FOLLOW_ALL,
B_FRAME_EVENTS|B_WILL_DRAW, false, true, B_PLAIN_BORDER); B_FRAME_EVENTS|B_WILL_DRAW, false, true, B_NO_BORDER);
AddChild(fScrollView); view->AddChild(fScrollView);
// add dragger view
BRect draggerFrame;
draggerFrame.top = shellFrame.bottom - 8;
draggerFrame.right = shellFrame.right;
draggerFrame.left = shellFrame.right - 7;
draggerFrame.bottom = Bounds().Height();
BDragger * dragger = new BDragger(draggerFrame,fScrollView,B_FOLLOW_RIGHT|B_FOLLOW_BOTTOM,B_FRAME_EVENTS|B_WILL_DRAW);
if (!BDragger::AreDraggersDrawn()) {
dragger->Hide();
}
view->AddChild(dragger);
// BRect blankFrame;
// blankFrame.top = shellFrame.bottom;
// blankFrame.right = draggerFrame.left;
// blankFrame.left = 0;
// blankFrame.bottom = draggerFrame.bottom;
// BView * blankView = new BView(blankFrame,"blankview",B_FOLLOW_ALL|B_WILL_DRAW,B_FRAME_EVENTS);
// view->AddChild(blankView);
fShellView->MakeFocus(true); fShellView->MakeFocus(true);
// Terminal menu // Terminal menu