From c2e9a9227ecadca3a4fdc7e7f7569fb9c7dc1391 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 3 Aug 2015 10:56:40 -0400 Subject: [PATCH] Revert "BTwoDimensionalLayout: Removed duplicated code." This reverts commit fd3e3e7bfb6e31cced1a98fc6a24c45f2feeba93. Apparently this code wasn't duplicated, as it caused all sorts of problems in applications (e.g. Debugger was blank). Fixes #12269. --- src/kits/interface/TwoDimensionalLayout.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/kits/interface/TwoDimensionalLayout.cpp b/src/kits/interface/TwoDimensionalLayout.cpp index ffb93b0441..a37f67a792 100644 --- a/src/kits/interface/TwoDimensionalLayout.cpp +++ b/src/kits/interface/TwoDimensionalLayout.cpp @@ -21,6 +21,8 @@ #include "CollapsingLayouter.h" + + // Some words of explanation: // // This class is the base class for BLayouts that organize their items @@ -921,6 +923,13 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::InternalGetHeightForWidth( } updateCachedInfo = true; + + // get the height for width info + fCachedMinHeightForWidth = fHeightForWidthLayouter->MinSize(); + fCachedMaxHeightForWidth = fHeightForWidthLayouter->MaxSize(); + fCachedPreferredHeightForWidth + = fHeightForWidthLayouter->PreferredSize(); + } else if (localLayouter->HasHeightForWidth()) { // 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