* fixed off by one errors when calculating min size
* added setter for internal spacing git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17916 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -57,6 +57,20 @@ Group::GetPreferredSize(float* width, float* height)
|
|||||||
|
|
||||||
// #pragma mark -
|
// #pragma mark -
|
||||||
|
|
||||||
|
void
|
||||||
|
Group::SetSpacing(float insetFromBorder, float childSpacing)
|
||||||
|
{
|
||||||
|
if (fSpacing == childSpacing && fInset == insetFromBorder)
|
||||||
|
return;
|
||||||
|
|
||||||
|
fInset = insetFromBorder;
|
||||||
|
fSpacing = childSpacing;
|
||||||
|
// trigger a layout
|
||||||
|
FrameResized(Bounds().Width(), Bounds().Height());
|
||||||
|
}
|
||||||
|
|
||||||
|
// #pragma mark -
|
||||||
|
|
||||||
// _LayoutControls
|
// _LayoutControls
|
||||||
void
|
void
|
||||||
Group::_LayoutControls(BRect r) const
|
Group::_LayoutControls(BRect r) const
|
||||||
@@ -88,16 +102,16 @@ Group::_MinFrame() const
|
|||||||
if (fOrientation == B_HORIZONTAL) {
|
if (fOrientation == B_HORIZONTAL) {
|
||||||
minWidth += fSpacing;
|
minWidth += fSpacing;
|
||||||
for (int32 i = 0; BView* child = ChildAt(i); i++) {
|
for (int32 i = 0; BView* child = ChildAt(i); i++) {
|
||||||
minWidth += child->Bounds().Width() + fSpacing;
|
minWidth += child->Bounds().Width() + 1 + fSpacing;
|
||||||
minHeight = max_c(minHeight,
|
minHeight = max_c(minHeight,
|
||||||
child->Bounds().Height() + fInset * 2.0);
|
child->Bounds().Height() + 1 + fInset * 2.0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
minHeight += fSpacing;
|
minHeight += fSpacing;
|
||||||
for (int32 i = 0; BView* child = ChildAt(i); i++) {
|
for (int32 i = 0; BView* child = ChildAt(i); i++) {
|
||||||
minHeight += child->Bounds().Height() + fSpacing;
|
minHeight += child->Bounds().Height() + 1 + fSpacing;
|
||||||
minWidth = max_c(minWidth,
|
minWidth = max_c(minWidth,
|
||||||
child->Bounds().Width() + fInset * 2.0);
|
child->Bounds().Width() + 1 + fInset * 2.0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ class Group : public BView {
|
|||||||
virtual void FrameResized(float width, float height);
|
virtual void FrameResized(float width, float height);
|
||||||
virtual void GetPreferredSize(float* width, float* height);
|
virtual void GetPreferredSize(float* width, float* height);
|
||||||
|
|
||||||
// TODO: allow setting inset and spacing
|
// Group
|
||||||
|
void SetSpacing(float insetFromBorder,
|
||||||
|
float childSpacing);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _LayoutControls(BRect frame) const;
|
void _LayoutControls(BRect frame) const;
|
||||||
|
|||||||
Reference in New Issue
Block a user