diff --git a/headers/libs/alm/ALMGroup.h b/headers/libs/alm/ALMGroup.h index 8886141a33..363c305a65 100644 --- a/headers/libs/alm/ALMGroup.h +++ b/headers/libs/alm/ALMGroup.h @@ -60,6 +60,8 @@ private: std::vector fGroups; enum orientation fOrientation; + + uint32 _reserved[4]; }; diff --git a/headers/libs/alm/ALMLayout.h b/headers/libs/alm/ALMLayout.h index 480e2b2698..9a7a920a47 100644 --- a/headers/libs/alm/ALMLayout.h +++ b/headers/libs/alm/ALMLayout.h @@ -108,6 +108,8 @@ public: virtual BSize BasePreferredSize(); virtual BAlignment BaseAlignment(); + virtual status_t Perform(perform_code d, void* arg); + protected: virtual bool ItemAdded(BLayoutItem* item, int32 atIndex); virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex); @@ -116,6 +118,24 @@ protected: virtual void DoLayout(); 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 YTab; friend class Area; @@ -154,6 +174,8 @@ private: YTabList fYTabList; RowColumnManager* fRowColumnManager; + + uint32 _reserved[5]; }; } // namespace BALM diff --git a/headers/libs/alm/Area.h b/headers/libs/alm/Area.h index 71e409d449..d0e8c4b472 100644 --- a/headers/libs/alm/Area.h +++ b/headers/libs/alm/Area.h @@ -112,6 +112,9 @@ private: void _UpdateMinSizeConstraint(BSize min); void _UpdateMaxSizeConstraint(BSize max); private: + friend class BALMLayout; + friend class RowColumnManager; + BLayoutItem* fLayoutItem; int32 fID; @@ -141,10 +144,7 @@ private: LinearProgramming::Constraint* fMaxContentHeight; LinearProgramming::Constraint* fContentAspectRatioC; -public: - friend class BALMLayout; - friend class RowColumnManager; - + uint32 _reserved[2]; }; } // namespace BALM diff --git a/headers/libs/alm/Tab.h b/headers/libs/alm/Tab.h index a1b4daaa88..ab21ec7a1f 100644 --- a/headers/libs/alm/Tab.h +++ b/headers/libs/alm/Tab.h @@ -30,6 +30,8 @@ protected: private: BALMLayout* fALMLayout; + + uint32 _reserved[2]; }; @@ -43,6 +45,8 @@ protected: private: BALMLayout* fALMLayout; + + uint32 _reserved[2]; }; diff --git a/src/libs/alm/ALMLayout.cpp b/src/libs/alm/ALMLayout.cpp index 8976801ff7..83ffb1218e 100644 --- a/src/libs/alm/ALMLayout.cpp +++ b/src/libs/alm/ALMLayout.cpp @@ -941,3 +941,23 @@ BALMLayout::_UpdateAreaConstraints() AreaFor(ItemAt(i))->InvalidateSizeConstraints(); 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() {} +