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

* fixed off by one errors when calculating min size

Browse Source 
* 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:
Stephan Aßmus 2006-06-23 23:12:18 +00:00
parent 31e2089106
commit 5ca1108776
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/apps/icon-o-matic/generic/gui/Group.cpp
View File

@ -57,6 +57,20 @@ Group::GetPreferredSize(float* width, float* height)
// #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
void
Group::_LayoutControls(BRect r) const
@ -88,16 +102,16 @@ Group::_MinFrame() const
if (fOrientation == B_HORIZONTAL) {
minWidth += fSpacing;
for (int32 i = 0; BView* child = ChildAt(i); i++) {
minWidth += child->Bounds().Width() + fSpacing;
minWidth += child->Bounds().Width() + 1 + fSpacing;
minHeight = max_c(minHeight,
child->Bounds().Height() + fInset * 2.0);
child->Bounds().Height() + 1 + fInset * 2.0);
}
} else {
minHeight += fSpacing;
for (int32 i = 0; BView* child = ChildAt(i); i++) {
minHeight += child->Bounds().Height() + fSpacing;
minHeight += child->Bounds().Height() + 1 + fSpacing;
minWidth = max_c(minWidth,
child->Bounds().Width() + fInset * 2.0);
child->Bounds().Width() + 1 + fInset * 2.0);
}
}

4
src/apps/icon-o-matic/generic/gui/Group.h
View File

@ -23,7 +23,9 @@ class Group : public BView {
virtual void FrameResized(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:
void _LayoutControls(BRect frame) const;