Revert "Revert "BTwoDimensionalLayout: Removed duplicated code.""
This reverts commit c2e9a9227e. I
misunderstood what Diver meant -- apparently whe he said "revert",
he meant the whole changeset, not this specific commit. So the culprit
is probably BTextView then.
This commit is contained in:
@@ -21,8 +21,6 @@
|
|||||||
#include "CollapsingLayouter.h"
|
#include "CollapsingLayouter.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Some words of explanation:
|
// Some words of explanation:
|
||||||
//
|
//
|
||||||
// This class is the base class for BLayouts that organize their items
|
// This class is the base class for BLayouts that organize their items
|
||||||
@@ -923,13 +921,6 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::InternalGetHeightForWidth(
|
|||||||
}
|
}
|
||||||
|
|
||||||
updateCachedInfo = true;
|
updateCachedInfo = true;
|
||||||
|
|
||||||
// get the height for width info
|
|
||||||
fCachedMinHeightForWidth = fHeightForWidthLayouter->MinSize();
|
|
||||||
fCachedMaxHeightForWidth = fHeightForWidthLayouter->MaxSize();
|
|
||||||
fCachedPreferredHeightForWidth
|
|
||||||
= fHeightForWidthLayouter->PreferredSize();
|
|
||||||
|
|
||||||
} else if (localLayouter->HasHeightForWidth()) {
|
} else if (localLayouter->HasHeightForWidth()) {
|
||||||
// There is a height for width layouter and it has been initialized
|
// There is a height for width layouter and it has been initialized
|
||||||
// in the current layout context. So we just add the height for width
|
// in the current layout context. So we just add the height for width
|
||||||
|
|||||||
Reference in New Issue
Block a user