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

Workaround to not trigger a relayout in DoLayout when adding the label view again.

Browse Source
This commit is contained in:
czeidler 2012-05-09 14:34:44 +12:00
parent f1e0212d72
commit 58f3387d56
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kits/interface/Box.cpp
View File

@ -550,21 +550,24 @@ BBox::DoLayout()
if (!(Flags() & B_SUPPORTS_LAYOUT))
return;
bool layouted = GetLayout() ? true : false;
BLayout* layout = GetLayout();
// If the user set a layout, let the base class version call its
// hook. In case when we have BView as a label, remove it from child list
// so it won't be layouted with the rest of views and add it again
// after that.
if (layouted) {
if (layout != NULL) {
if (fLabelView)
RemoveChild(fLabelView);
BView::DoLayout();
if (fLabelView)
if (fLabelView != NULL) {
layout->DisableLayoutInvalidation();
// don't trigger a relayout
AddChild(fLabelView, ChildAt(0));
else
layout->EnableLayoutInvalidation();
} else
return;
}
@ -574,13 +577,13 @@ BBox::DoLayout()
// desired position.
// layout the label view
if (fLabelView) {
if (fLabelView != NULL) {
fLabelView->MoveTo(fLayoutData->label_box.LeftTop());
fLabelView->ResizeTo(fLayoutData->label_box.Size());
}
// If we have layout return here and do not layout the child
if (layouted)
if (layout != NULL)
return;
// layout the child