Add FBC padding to ALM classes.

This commit is contained in:
Alex Wilson
2012-05-03 08:44:35 +12:00
parent 7e021d45da
commit 324ce2851d
5 changed files with 52 additions and 4 deletions
+2
View File
@@ -60,6 +60,8 @@ private:
std::vector<ALMGroup> fGroups; std::vector<ALMGroup> fGroups;
enum orientation fOrientation; enum orientation fOrientation;
uint32 _reserved[4];
}; };
+22
View File
@@ -108,6 +108,8 @@ public:
virtual BSize BasePreferredSize(); virtual BSize BasePreferredSize();
virtual BAlignment BaseAlignment(); virtual BAlignment BaseAlignment();
virtual status_t Perform(perform_code d, void* arg);
protected: protected:
virtual bool ItemAdded(BLayoutItem* item, int32 atIndex); virtual bool ItemAdded(BLayoutItem* item, int32 atIndex);
virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex); virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex);
@@ -116,6 +118,24 @@ protected:
virtual void DoLayout(); virtual void DoLayout();
private: private:
// FBC padding
virtual void _ReservedALMLayout1();
virtual void _ReservedALMLayout2();
virtual void _ReservedALMLayout3();
virtual void _ReservedALMLayout4();
virtual void _ReservedALMLayout5();
virtual void _ReservedALMLayout6();
virtual void _ReservedALMLayout7();
virtual void _ReservedALMLayout8();
virtual void _ReservedALMLayout9();
virtual void _ReservedALMLayout10();
// forbidden methods
BALMLayout(const BALMLayout&);
void operator =(const BALMLayout&);
friend class XTab; friend class XTab;
friend class YTab; friend class YTab;
friend class Area; friend class Area;
@@ -154,6 +174,8 @@ private:
YTabList fYTabList; YTabList fYTabList;
RowColumnManager* fRowColumnManager; RowColumnManager* fRowColumnManager;
uint32 _reserved[5];
}; };
} // namespace BALM } // namespace BALM
+4 -4
View File
@@ -112,6 +112,9 @@ private:
void _UpdateMinSizeConstraint(BSize min); void _UpdateMinSizeConstraint(BSize min);
void _UpdateMaxSizeConstraint(BSize max); void _UpdateMaxSizeConstraint(BSize max);
private: private:
friend class BALMLayout;
friend class RowColumnManager;
BLayoutItem* fLayoutItem; BLayoutItem* fLayoutItem;
int32 fID; int32 fID;
@@ -141,10 +144,7 @@ private:
LinearProgramming::Constraint* fMaxContentHeight; LinearProgramming::Constraint* fMaxContentHeight;
LinearProgramming::Constraint* fContentAspectRatioC; LinearProgramming::Constraint* fContentAspectRatioC;
public: uint32 _reserved[2];
friend class BALMLayout;
friend class RowColumnManager;
}; };
} // namespace BALM } // namespace BALM
+4
View File
@@ -30,6 +30,8 @@ protected:
private: private:
BALMLayout* fALMLayout; BALMLayout* fALMLayout;
uint32 _reserved[2];
}; };
@@ -43,6 +45,8 @@ protected:
private: private:
BALMLayout* fALMLayout; BALMLayout* fALMLayout;
uint32 _reserved[2];
}; };
+20
View File
@@ -941,3 +941,23 @@ BALMLayout::_UpdateAreaConstraints()
AreaFor(ItemAt(i))->InvalidateSizeConstraints(); AreaFor(ItemAt(i))->InvalidateSizeConstraints();
fRowColumnManager->UpdateConstraints(); fRowColumnManager->UpdateConstraints();
} }
status_t
BALMLayout::Perform(perform_code d, void* arg)
{
return BAbstractLayout::Perform(d, arg);
}
void BALMLayout::_ReservedALMLayout1() {}
void BALMLayout::_ReservedALMLayout2() {}
void BALMLayout::_ReservedALMLayout3() {}
void BALMLayout::_ReservedALMLayout4() {}
void BALMLayout::_ReservedALMLayout5() {}
void BALMLayout::_ReservedALMLayout6() {}
void BALMLayout::_ReservedALMLayout7() {}
void BALMLayout::_ReservedALMLayout8() {}
void BALMLayout::_ReservedALMLayout9() {}
void BALMLayout::_ReservedALMLayout10() {}