From 2ffa9f8e542aa0c7dffd043e908d1af92da9d3aa Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 3 Aug 2015 13:07:06 -0400 Subject: [PATCH] Revert "Revert "BTwoDimensionalLayout: Removed duplicated code."" This reverts commit c2e9a9227ecadca3a4fdc7e7f7569fb9c7dc1391. 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. --- src/kits/interface/TwoDimensionalLayout.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/kits/interface/TwoDimensionalLayout.cpp b/src/kits/interface/TwoDimensionalLayout.cpp index a37f67a792..ffb93b0441 100644 --- a/src/kits/interface/TwoDimensionalLayout.cpp +++ b/src/kits/interface/TwoDimensionalLayout.cpp @@ -21,8 +21,6 @@ #include "CollapsingLayouter.h" - - // Some words of explanation: // // This class is the base class for BLayouts that organize their items @@ -923,13 +921,6 @@ 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