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

BColorControl: Refactor _LayoutView()

Browse Source 
In a few cases we were doing the work of _LayoutView() twice because
we called _LayoutView() and then called ResizeToPreferred() which called
_LayoutView() again.

Now only call ResizeToPreferred() which calls _LayoutView().
This commit is contained in:
John Scipione 2013-06-07 17:09:34 -04:00
parent da6c116d63
commit d5432ed609
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kits/interface/ColorControl.cpp
View File

@ -168,7 +168,7 @@ BColorControl::_InitData(color_control_layout layout, float size,
AddChild(fBlueText);
}
_LayoutView();
ResizeToPreferred();
if (useOffscreen) {
BRect bounds = _PaletteFrame();
@ -199,9 +199,6 @@ BColorControl::_LayoutView()
BRect rect = fPaletteFrame.InsetByCopy(-kBevelSpacing, -kBevelSpacing);
// frame including bevel
if (rect.Height() < fBlueText->Frame().bottom)
rect.bottom = fBlueText->Frame().bottom;
float offset = floorf(rect.bottom / 4);
float y = offset;
if (offset < _TextRectOffset()) {
@ -216,9 +213,6 @@ BColorControl::_LayoutView()
y += offset;
fBlueText->MoveTo(rect.right + kTextFieldsHSpacing, y);
ResizeTo(rect.Width() + kTextFieldsHSpacing + fRedText->Bounds().Width(),
rect.Height());
}
@ -662,7 +656,6 @@ void
BColorControl::SetCellSize(float size)
{
_SetCellSize(size);
_LayoutView();
ResizeToPreferred();
}
@ -700,8 +693,6 @@ BColorControl::SetLayout(color_control_layout layout)
break;
}
_LayoutView();
ResizeToPreferred();
Invalidate();
}
@ -877,9 +868,8 @@ BColorControl::GetPreferredSize(float* _width, float* _height)
void
BColorControl::ResizeToPreferred()
{
BControl::ResizeToPreferred();
_LayoutView();
BControl::ResizeToPreferred();
}