Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor XTab and YTab to share a common base, TabBase. 

TabBase takes care of layout tracking etc..
This commit is contained in:
Alex Wilson 2012-01-19 16:37:13 +13:00
parent a9761aedbf
commit 708a298e22
2 changed files with 48 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
headers/libs/alm/Tab.h
View File

@ -17,18 +17,14 @@ namespace BALM {
class BALMLayout;
/**
* Vertical grid line (x-tab).
*/
class XTab : public Variable, public BReferenceable {
public:
virtual ~XTab();
protected:
friend class BALMLayout;
XTab(BALMLayout* layout);
class TabBase {
private:
TabBase();
virtual ~TabBase();
friend class BALMLayout;
friend class XTab;
friend class YTab;
struct BALMLayoutList;
bool IsInLayout(BALMLayout* layout);
@ -37,27 +33,33 @@ private:
bool IsSuitableFor(BALMLayout* layout);
BALMLayoutList* fLayouts;
};
/**
* Vertical grid line (x-tab).
*/
class XTab : public Variable, public TabBase, public BReferenceable {
public:
virtual ~XTab();
protected:
friend class BALMLayout;
XTab(BALMLayout* layout);
private:
uint32 _reserved[2];
};
class YTab : public Variable, public BReferenceable {
class YTab : public Variable, public TabBase, public BReferenceable {
public:
virtual ~YTab();
protected:
friend class BALMLayout;
YTab(BALMLayout* layout);
private:
bool IsInLayout(BALMLayout* layout);
bool AddedToLayout(BALMLayout* layout);
void LayoutLeaving(BALMLayout* layout);
bool IsSuitableFor(BALMLayout* layout);
XTab::BALMLayoutList* fLayouts;
uint32 _reserved[2];
};

72
src/libs/alm/Tab.cpp
View File

@ -11,9 +11,10 @@
using std::nothrow;
using BALM::TabBase;
struct XTab::BALMLayoutList {
struct TabBase::BALMLayoutList {
BALMLayoutList(BALMLayout* _layout, BALMLayoutList* _next = NULL)
:
next(_next),
@ -50,34 +51,27 @@ struct XTab::BALMLayoutList {
};
XTab::XTab(BALMLayout* layout)
TabBase::TabBase()
:
Variable(layout->Solver()),
fLayouts(new BALMLayoutList(layout))
fLayouts(NULL)
{
}
XTab::~XTab()
TabBase::~TabBase()
{
BALMLayoutList* layouts = fLayouts;
while (layouts) {
layouts->layout->fXTabList.RemoveItem(this);
layouts = layouts->next;
}
delete fLayouts;
}
bool
XTab::IsInLayout(BALMLayout* layout)
TabBase::IsInLayout(BALMLayout* layout)
{
return fLayouts->HasLayout(layout);
}
bool
XTab::AddedToLayout(BALMLayout* layout)
TabBase::AddedToLayout(BALMLayout* layout)
{
BALMLayoutList* newHead = new (nothrow) BALMLayoutList(layout, fLayouts);
if (newHead == NULL)
@ -88,66 +82,52 @@ XTab::AddedToLayout(BALMLayout* layout)
void
XTab::LayoutLeaving(BALMLayout* layout)
TabBase::LayoutLeaving(BALMLayout* layout)
{
fLayouts = fLayouts->Remove(layout);
}
bool
XTab::IsSuitableFor(BALMLayout* layout)
TabBase::IsSuitableFor(BALMLayout* layout)
{
return (fLayouts->layout->Solver() == layout->Solver());
}
YTab::YTab(BALMLayout* layout)
XTab::XTab(BALMLayout* layout)
:
Variable(layout->Solver()),
fLayouts(new XTab::BALMLayoutList(layout))
Variable(layout->Solver())
{
AddedToLayout(layout);
}
YTab::~YTab()
XTab::~XTab()
{
XTab::BALMLayoutList* layouts = fLayouts;
TabBase::BALMLayoutList* layouts = fLayouts;
while (layouts) {
layouts->layout->fYTabList.RemoveItem(this);
layouts->layout->fXTabList.RemoveItem(this);
layouts = layouts->next;
}
delete fLayouts;
}
bool
YTab::IsInLayout(BALMLayout* layout)
YTab::YTab(BALMLayout* layout)
:
Variable(layout->Solver())
{
return fLayouts->HasLayout(layout);
AddedToLayout(layout);
}
bool
YTab::AddedToLayout(BALMLayout* layout)
YTab::~YTab()
{
XTab::BALMLayoutList* newHead
= new (nothrow) XTab::BALMLayoutList(layout, fLayouts);
if (newHead == NULL)
return false;
fLayouts = newHead;
return true;
}
void
YTab::LayoutLeaving(BALMLayout* layout)
{
fLayouts = fLayouts->Remove(layout);
}
bool
YTab::IsSuitableFor(BALMLayout* layout)
{
return (fLayouts->layout->Solver() == layout->Solver());
TabBase::BALMLayoutList* layouts = fLayouts;
while (layouts) {
layouts->layout->fYTabList.RemoveItem(this);
layouts = layouts->next;
}
delete fLayouts;
}