diff --git a/src/prefs/devices/DevicesWindows.h b/src/prefs/devices/DevicesWindows.h index b3dd7ee3fd..cf8b9f99a9 100644 --- a/src/prefs/devices/DevicesWindows.h +++ b/src/prefs/devices/DevicesWindows.h @@ -14,6 +14,7 @@ Devices Windows Header by Sikosis class DevicesView; class ResourceUsageView; +class IRQView; class ResourceUsageWindow : public BWindow { @@ -24,9 +25,9 @@ class ResourceUsageWindow : public BWindow private: void InitWindow(void); ResourceUsageView* ptrResourceUsageView; - - BTabView *tabView; - BTab *tab; + IRQView* ptrIRQView; + BTabView *tabView; + BTab *tab; }; diff --git a/src/prefs/devices/ResourceUsageWindow.cpp b/src/prefs/devices/ResourceUsageWindow.cpp index 85c42787af..7cf0de5791 100644 --- a/src/prefs/devices/ResourceUsageWindow.cpp +++ b/src/prefs/devices/ResourceUsageWindow.cpp @@ -68,10 +68,12 @@ void ResourceUsageWindow::InitWindow(void) rtab = Bounds(); rtab.top += 10; rlist = Bounds(); - rlist.top += 44; + rlist.top += 10; rlist.left += 12; - rlist.right -= 12; - rlist.bottom -= 12; + rlist.right -= 15; + rlist.bottom -= 47; + + ptrIRQView = new IRQView(r); // Create the TabView and Tabs tabView = new BTabView(rtab,"resource_usage_tabview"); @@ -79,7 +81,7 @@ void ResourceUsageWindow::InitWindow(void) rtab = tabView->Bounds(); rtab.InsetBy(5,5); tab = new BTab(); - tabView->AddTab(new IRQView(r), tab); + tabView->AddTab(ptrIRQView, tab); tab->SetLabel("IRQ"); tab = new BTab(); tabView->AddTab(new DMAView(r), tab); @@ -105,14 +107,11 @@ void ResourceUsageWindow::InitWindow(void) Lock(); IRQListView->AddItem(new BStringItem(tmp.String())); Unlock(); - + ptrIRQView->AddChild(IRQListView); + // Create the Views AddChild(ptrResourceUsageView = new ResourceUsageView(r)); ptrResourceUsageView->AddChild(tabView); - AddChild(IRQListView); - - IRQListView->MakeFocus(); - DMAListView->Hide(); } // -------------------------------------------------------------------------------------------------- //