Fixed up the way the TabView was working.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4109 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Phil Greenway
2003-07-27 13:07:41 +00:00
parent 4d1fb4b669
commit 9e53835da9
2 changed files with 12 additions and 12 deletions
+4 -3
View File
@@ -14,6 +14,7 @@ Devices Windows Header by Sikosis
class DevicesView; class DevicesView;
class ResourceUsageView; class ResourceUsageView;
class IRQView;
class ResourceUsageWindow : public BWindow class ResourceUsageWindow : public BWindow
{ {
@@ -24,9 +25,9 @@ class ResourceUsageWindow : public BWindow
private: private:
void InitWindow(void); void InitWindow(void);
ResourceUsageView* ptrResourceUsageView; ResourceUsageView* ptrResourceUsageView;
IRQView* ptrIRQView;
BTabView *tabView; BTabView *tabView;
BTab *tab; BTab *tab;
}; };
+8 -9
View File
@@ -68,10 +68,12 @@ void ResourceUsageWindow::InitWindow(void)
rtab = Bounds(); rtab = Bounds();
rtab.top += 10; rtab.top += 10;
rlist = Bounds(); rlist = Bounds();
rlist.top += 44; rlist.top += 10;
rlist.left += 12; rlist.left += 12;
rlist.right -= 12; rlist.right -= 15;
rlist.bottom -= 12; rlist.bottom -= 47;
ptrIRQView = new IRQView(r);
// Create the TabView and Tabs // Create the TabView and Tabs
tabView = new BTabView(rtab,"resource_usage_tabview"); tabView = new BTabView(rtab,"resource_usage_tabview");
@@ -79,7 +81,7 @@ void ResourceUsageWindow::InitWindow(void)
rtab = tabView->Bounds(); rtab = tabView->Bounds();
rtab.InsetBy(5,5); rtab.InsetBy(5,5);
tab = new BTab(); tab = new BTab();
tabView->AddTab(new IRQView(r), tab); tabView->AddTab(ptrIRQView, tab);
tab->SetLabel("IRQ"); tab->SetLabel("IRQ");
tab = new BTab(); tab = new BTab();
tabView->AddTab(new DMAView(r), tab); tabView->AddTab(new DMAView(r), tab);
@@ -105,14 +107,11 @@ void ResourceUsageWindow::InitWindow(void)
Lock(); Lock();
IRQListView->AddItem(new BStringItem(tmp.String())); IRQListView->AddItem(new BStringItem(tmp.String()));
Unlock(); Unlock();
ptrIRQView->AddChild(IRQListView);
// Create the Views // Create the Views
AddChild(ptrResourceUsageView = new ResourceUsageView(r)); AddChild(ptrResourceUsageView = new ResourceUsageView(r));
ptrResourceUsageView->AddChild(tabView); ptrResourceUsageView->AddChild(tabView);
AddChild(IRQListView);
IRQListView->MakeFocus();
DMAListView->Hide();
} }
// -------------------------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------- //