Add FBC padding to all (I think..) of the visible Layout related classes.
This commit is contained in:
parent
a851b3ad54
commit
8151838e38
@ -46,11 +46,23 @@ protected:
|
||||
virtual void AncestorVisibilityChanged(bool shown);
|
||||
|
||||
private:
|
||||
virtual void _ReservedAbstractLayout1();
|
||||
virtual void _ReservedAbstractLayout2();
|
||||
virtual void _ReservedAbstractLayout3();
|
||||
virtual void _ReservedAbstractLayout4();
|
||||
virtual void _ReservedAbstractLayout5();
|
||||
virtual void _ReservedAbstractLayout6();
|
||||
virtual void _ReservedAbstractLayout7();
|
||||
virtual void _ReservedAbstractLayout8();
|
||||
virtual void _ReservedAbstractLayout9();
|
||||
virtual void _ReservedAbstractLayout10();
|
||||
|
||||
struct Proxy;
|
||||
struct ViewProxy;
|
||||
struct DataProxy;
|
||||
|
||||
Proxy* fExplicitData;
|
||||
uint32 _reserved[4];
|
||||
};
|
||||
|
||||
#endif // _ABSTRACT_LAYOUT_ITEM_H
|
||||
|
@ -36,10 +36,23 @@ public:
|
||||
virtual status_t Perform(perform_code d, void* arg);
|
||||
|
||||
private:
|
||||
virtual void _ReservedAbstractLayoutItem1();
|
||||
virtual void _ReservedAbstractLayoutItem2();
|
||||
virtual void _ReservedAbstractLayoutItem3();
|
||||
virtual void _ReservedAbstractLayoutItem4();
|
||||
virtual void _ReservedAbstractLayoutItem5();
|
||||
virtual void _ReservedAbstractLayoutItem6();
|
||||
virtual void _ReservedAbstractLayoutItem7();
|
||||
virtual void _ReservedAbstractLayoutItem8();
|
||||
virtual void _ReservedAbstractLayoutItem9();
|
||||
virtual void _ReservedAbstractLayoutItem10();
|
||||
|
||||
BSize fMinSize;
|
||||
BSize fMaxSize;
|
||||
BSize fPreferredSize;
|
||||
BAlignment fAlignment;
|
||||
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
#endif // _ABSTRACT_LAYOUT_ITEM_H
|
||||
|
@ -41,13 +41,28 @@ protected:
|
||||
virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex);
|
||||
|
||||
private:
|
||||
|
||||
void _ValidateMinMax();
|
||||
|
||||
// FBC padding
|
||||
virtual void _ReservedCardLayout1();
|
||||
virtual void _ReservedCardLayout2();
|
||||
virtual void _ReservedCardLayout3();
|
||||
virtual void _ReservedCardLayout4();
|
||||
virtual void _ReservedCardLayout5();
|
||||
virtual void _ReservedCardLayout6();
|
||||
virtual void _ReservedCardLayout7();
|
||||
virtual void _ReservedCardLayout8();
|
||||
virtual void _ReservedCardLayout9();
|
||||
virtual void _ReservedCardLayout10();
|
||||
|
||||
BSize fMin;
|
||||
BSize fMax;
|
||||
BSize fPreferred;
|
||||
BLayoutItem* fVisibleItem;
|
||||
bool fMinMaxValid;
|
||||
|
||||
void _ValidateMinMax();
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
#endif // _CARD_LAYOUT_H
|
||||
|
@ -98,6 +98,19 @@ private:
|
||||
ItemLayoutData* _LayoutDataForItem(BLayoutItem* item) const;
|
||||
|
||||
private:
|
||||
|
||||
// FBC padding
|
||||
virtual void _ReservedGridLayout1();
|
||||
virtual void _ReservedGridLayout2();
|
||||
virtual void _ReservedGridLayout3();
|
||||
virtual void _ReservedGridLayout4();
|
||||
virtual void _ReservedGridLayout5();
|
||||
virtual void _ReservedGridLayout6();
|
||||
virtual void _ReservedGridLayout7();
|
||||
virtual void _ReservedGridLayout8();
|
||||
virtual void _ReservedGridLayout9();
|
||||
virtual void _ReservedGridLayout10();
|
||||
|
||||
BLayoutItem*** fGrid;
|
||||
int32 fColumnCount;
|
||||
int32 fRowCount;
|
||||
@ -107,6 +120,8 @@ private:
|
||||
|
||||
int32 fMultiColumnItems;
|
||||
int32 fMultiRowItems;
|
||||
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
|
||||
|
@ -62,12 +62,27 @@ protected:
|
||||
Dimensions* dimensions);
|
||||
|
||||
private:
|
||||
|
||||
// FBC padding
|
||||
virtual void _ReservedGroupLayout1();
|
||||
virtual void _ReservedGroupLayout2();
|
||||
virtual void _ReservedGroupLayout3();
|
||||
virtual void _ReservedGroupLayout4();
|
||||
virtual void _ReservedGroupLayout5();
|
||||
virtual void _ReservedGroupLayout6();
|
||||
virtual void _ReservedGroupLayout7();
|
||||
virtual void _ReservedGroupLayout8();
|
||||
virtual void _ReservedGroupLayout9();
|
||||
virtual void _ReservedGroupLayout10();
|
||||
|
||||
struct ItemLayoutData;
|
||||
|
||||
ItemLayoutData* _LayoutDataForItem(BLayoutItem* item) const;
|
||||
|
||||
orientation fOrientation;
|
||||
BList fVisibleItems;
|
||||
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
#endif // _GROUP_LAYOUT_H
|
||||
|
@ -91,6 +91,19 @@ protected:
|
||||
virtual status_t Perform(perform_code d, void* arg);
|
||||
|
||||
private:
|
||||
|
||||
// FBC padding
|
||||
virtual void _ReservedLayout1();
|
||||
virtual void _ReservedLayout2();
|
||||
virtual void _ReservedLayout3();
|
||||
virtual void _ReservedLayout4();
|
||||
virtual void _ReservedLayout5();
|
||||
virtual void _ReservedLayout6();
|
||||
virtual void _ReservedLayout7();
|
||||
virtual void _ReservedLayout8();
|
||||
virtual void _ReservedLayout9();
|
||||
virtual void _ReservedLayout10();
|
||||
|
||||
friend class BView;
|
||||
|
||||
void SetOwner(BView* owner);
|
||||
@ -107,6 +120,8 @@ private:
|
||||
BView* fTarget;
|
||||
BList fItems;
|
||||
BList fNestedLayouts;
|
||||
|
||||
uint32 _reserved[10];
|
||||
};
|
||||
|
||||
|
||||
|
@ -16,6 +16,15 @@ public:
|
||||
virtual ~BLayoutContextListener();
|
||||
|
||||
virtual void LayoutContextLeft(BLayoutContext* context) = 0;
|
||||
|
||||
private:
|
||||
virtual void _ReservedLayoutContextListener1();
|
||||
virtual void _ReservedLayoutContextListener2();
|
||||
virtual void _ReservedLayoutContextListener3();
|
||||
virtual void _ReservedLayoutContextListener4();
|
||||
virtual void _ReservedLayoutContextListener5();
|
||||
|
||||
uint32 _reserved[3];
|
||||
};
|
||||
|
||||
|
||||
@ -30,6 +39,7 @@ public:
|
||||
|
||||
private:
|
||||
BList fListeners;
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
#endif // _LAYOUT_CONTEXT_H
|
||||
|
@ -72,10 +72,23 @@ protected:
|
||||
virtual void AncestorVisibilityChanged(bool shown);
|
||||
|
||||
private:
|
||||
virtual void _ReservedLayoutItem1();
|
||||
virtual void _ReservedLayoutItem2();
|
||||
virtual void _ReservedLayoutItem3();
|
||||
virtual void _ReservedLayoutItem4();
|
||||
virtual void _ReservedLayoutItem5();
|
||||
virtual void _ReservedLayoutItem6();
|
||||
virtual void _ReservedLayoutItem7();
|
||||
virtual void _ReservedLayoutItem8();
|
||||
virtual void _ReservedLayoutItem9();
|
||||
virtual void _ReservedLayoutItem10();
|
||||
|
||||
friend class BLayout;
|
||||
|
||||
BLayout* fLayout;
|
||||
void* fLayoutData;
|
||||
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
|
||||
|
@ -80,6 +80,19 @@ protected:
|
||||
bool pressed);
|
||||
|
||||
private:
|
||||
|
||||
// FBC padding
|
||||
virtual void _ReservedSplitView1();
|
||||
virtual void _ReservedSplitView2();
|
||||
virtual void _ReservedSplitView3();
|
||||
virtual void _ReservedSplitView4();
|
||||
virtual void _ReservedSplitView5();
|
||||
virtual void _ReservedSplitView6();
|
||||
virtual void _ReservedSplitView7();
|
||||
virtual void _ReservedSplitView8();
|
||||
virtual void _ReservedSplitView9();
|
||||
virtual void _ReservedSplitView10();
|
||||
|
||||
static void _DrawDefaultSplitter(BView* view, BRect frame,
|
||||
const BRect& updateRect,
|
||||
enum orientation orientation,
|
||||
@ -87,6 +100,7 @@ private:
|
||||
|
||||
private:
|
||||
BSplitLayout* fSplitLayout;
|
||||
uint32 _reserved[3];
|
||||
};
|
||||
|
||||
|
||||
|
@ -97,7 +97,22 @@ protected:
|
||||
float fVSpacing;
|
||||
|
||||
private:
|
||||
|
||||
// FBC padding
|
||||
virtual void _ReservedTwoDimensionalLayout1();
|
||||
virtual void _ReservedTwoDimensionalLayout2();
|
||||
virtual void _ReservedTwoDimensionalLayout3();
|
||||
virtual void _ReservedTwoDimensionalLayout4();
|
||||
virtual void _ReservedTwoDimensionalLayout5();
|
||||
virtual void _ReservedTwoDimensionalLayout6();
|
||||
virtual void _ReservedTwoDimensionalLayout7();
|
||||
virtual void _ReservedTwoDimensionalLayout8();
|
||||
virtual void _ReservedTwoDimensionalLayout9();
|
||||
virtual void _ReservedTwoDimensionalLayout10();
|
||||
|
||||
LocalLayouter* fLocalLayouter;
|
||||
|
||||
uint32 _reserved[5];
|
||||
};
|
||||
|
||||
#endif // _TWO_DIMENSIONAL_LAYOUT_H
|
||||
|
@ -459,9 +459,24 @@ BAbstractLayout::AncestorVisibilityChanged(bool shown)
|
||||
}
|
||||
|
||||
|
||||
// Binary compatibility stuff
|
||||
|
||||
|
||||
status_t
|
||||
BAbstractLayout::Perform(perform_code code, void* _data)
|
||||
{
|
||||
return BLayout::Perform(code, _data);
|
||||
}
|
||||
|
||||
|
||||
void BAbstractLayout::_ReservedAbstractLayout1() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout2() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout3() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout4() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout5() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout6() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout7() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout8() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout9() {}
|
||||
void BAbstractLayout::_ReservedAbstractLayout10() {}
|
||||
|
||||
|
@ -160,3 +160,15 @@ BAbstractLayoutItem::Perform(perform_code d, void* arg)
|
||||
return BLayoutItem::Perform(d, arg);
|
||||
}
|
||||
|
||||
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem1() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem2() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem3() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem4() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem5() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem6() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem7() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem8() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem9() {}
|
||||
void BAbstractLayoutItem::_ReservedAbstractLayoutItem10() {}
|
||||
|
||||
|
@ -305,3 +305,15 @@ BCardLayout::Perform(perform_code d, void* arg)
|
||||
return BAbstractLayout::Perform(d, arg);
|
||||
}
|
||||
|
||||
|
||||
void BCardLayout::_ReservedCardLayout1() {}
|
||||
void BCardLayout::_ReservedCardLayout2() {}
|
||||
void BCardLayout::_ReservedCardLayout3() {}
|
||||
void BCardLayout::_ReservedCardLayout4() {}
|
||||
void BCardLayout::_ReservedCardLayout5() {}
|
||||
void BCardLayout::_ReservedCardLayout6() {}
|
||||
void BCardLayout::_ReservedCardLayout7() {}
|
||||
void BCardLayout::_ReservedCardLayout8() {}
|
||||
void BCardLayout::_ReservedCardLayout9() {}
|
||||
void BCardLayout::_ReservedCardLayout10() {}
|
||||
|
||||
|
@ -795,3 +795,15 @@ BGridLayout::Perform(perform_code d, void* arg)
|
||||
return BTwoDimensionalLayout::Perform(d, arg);
|
||||
}
|
||||
|
||||
|
||||
void BGridLayout::_ReservedGridLayout1() {}
|
||||
void BGridLayout::_ReservedGridLayout2() {}
|
||||
void BGridLayout::_ReservedGridLayout3() {}
|
||||
void BGridLayout::_ReservedGridLayout4() {}
|
||||
void BGridLayout::_ReservedGridLayout5() {}
|
||||
void BGridLayout::_ReservedGridLayout6() {}
|
||||
void BGridLayout::_ReservedGridLayout7() {}
|
||||
void BGridLayout::_ReservedGridLayout8() {}
|
||||
void BGridLayout::_ReservedGridLayout9() {}
|
||||
void BGridLayout::_ReservedGridLayout10() {}
|
||||
|
||||
|
@ -334,3 +334,15 @@ BGroupLayout::Perform(perform_code code, void* _data)
|
||||
return BTwoDimensionalLayout::Perform(code, _data);
|
||||
}
|
||||
|
||||
|
||||
void BGroupLayout::_ReservedGroupLayout1() {}
|
||||
void BGroupLayout::_ReservedGroupLayout2() {}
|
||||
void BGroupLayout::_ReservedGroupLayout3() {}
|
||||
void BGroupLayout::_ReservedGroupLayout4() {}
|
||||
void BGroupLayout::_ReservedGroupLayout5() {}
|
||||
void BGroupLayout::_ReservedGroupLayout6() {}
|
||||
void BGroupLayout::_ReservedGroupLayout7() {}
|
||||
void BGroupLayout::_ReservedGroupLayout8() {}
|
||||
void BGroupLayout::_ReservedGroupLayout9() {}
|
||||
void BGroupLayout::_ReservedGroupLayout10() {}
|
||||
|
||||
|
@ -619,9 +619,24 @@ BLayout::SetTarget(BView* target)
|
||||
}
|
||||
|
||||
|
||||
// Binary compatibility stuff
|
||||
|
||||
|
||||
status_t
|
||||
BLayout::Perform(perform_code code, void* _data)
|
||||
{
|
||||
return BLayoutItem::Perform(code, _data);
|
||||
}
|
||||
|
||||
|
||||
void BLayout::_ReservedLayout1() {}
|
||||
void BLayout::_ReservedLayout2() {}
|
||||
void BLayout::_ReservedLayout3() {}
|
||||
void BLayout::_ReservedLayout4() {}
|
||||
void BLayout::_ReservedLayout5() {}
|
||||
void BLayout::_ReservedLayout6() {}
|
||||
void BLayout::_ReservedLayout7() {}
|
||||
void BLayout::_ReservedLayout8() {}
|
||||
void BLayout::_ReservedLayout9() {}
|
||||
void BLayout::_ReservedLayout10() {}
|
||||
|
||||
|
@ -17,6 +17,13 @@ BLayoutContextListener::~BLayoutContextListener()
|
||||
}
|
||||
|
||||
|
||||
void BLayoutContextListener::_ReservedLayoutContextListener1() {}
|
||||
void BLayoutContextListener::_ReservedLayoutContextListener2() {}
|
||||
void BLayoutContextListener::_ReservedLayoutContextListener3() {}
|
||||
void BLayoutContextListener::_ReservedLayoutContextListener4() {}
|
||||
void BLayoutContextListener::_ReservedLayoutContextListener5() {}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
|
||||
|
||||
|
@ -218,3 +218,18 @@ BLayoutItem::AncestorVisibilityChanged(bool shown)
|
||||
// hook method
|
||||
}
|
||||
|
||||
|
||||
// Binary compatibility stuff
|
||||
|
||||
|
||||
void BLayoutItem::_ReservedLayoutItem1() {}
|
||||
void BLayoutItem::_ReservedLayoutItem2() {}
|
||||
void BLayoutItem::_ReservedLayoutItem3() {}
|
||||
void BLayoutItem::_ReservedLayoutItem4() {}
|
||||
void BLayoutItem::_ReservedLayoutItem5() {}
|
||||
void BLayoutItem::_ReservedLayoutItem6() {}
|
||||
void BLayoutItem::_ReservedLayoutItem7() {}
|
||||
void BLayoutItem::_ReservedLayoutItem8() {}
|
||||
void BLayoutItem::_ReservedLayoutItem9() {}
|
||||
void BLayoutItem::_ReservedLayoutItem10() {}
|
||||
|
||||
|
@ -1430,3 +1430,4 @@ BSplitLayout::_SubtractInsets(BSize size)
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
|
@ -331,3 +331,15 @@ BSplitView::Perform(perform_code d, void* arg)
|
||||
return BView::Perform(d, arg);
|
||||
}
|
||||
|
||||
|
||||
void BSplitView::_ReservedSplitView1() {}
|
||||
void BSplitView::_ReservedSplitView2() {}
|
||||
void BSplitView::_ReservedSplitView3() {}
|
||||
void BSplitView::_ReservedSplitView4() {}
|
||||
void BSplitView::_ReservedSplitView5() {}
|
||||
void BSplitView::_ReservedSplitView6() {}
|
||||
void BSplitView::_ReservedSplitView7() {}
|
||||
void BSplitView::_ReservedSplitView8() {}
|
||||
void BSplitView::_ReservedSplitView9() {}
|
||||
void BSplitView::_ReservedSplitView10() {}
|
||||
|
||||
|
@ -1415,3 +1415,15 @@ BTwoDimensionalLayout::Perform(perform_code code, void* _data)
|
||||
return BAbstractLayout::Perform(code, _data);
|
||||
}
|
||||
|
||||
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout1() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout2() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout3() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout4() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout5() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout6() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout7() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout8() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout9() {}
|
||||
void BTwoDimensionalLayout::_ReservedTwoDimensionalLayout10() {}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user