From 8fc91bbfd90c0ccafc842d94e2b3bd10b8889595 Mon Sep 17 00:00:00 2001
From: Sebastian Geerken <devnull@localhost>
Date: Sun, 4 Jan 2015 20:44:00 +0100
Subject: Added Extremes::adjustmentWidth; fixed
 Textblock::mustBeWidenedToAvailWidth.

---
 dw/widget.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'dw/widget.cc')

diff --git a/dw/widget.cc b/dw/widget.cc
index 7b0d4c99..ac46daf5 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -544,10 +544,12 @@ int Widget::getMinWidth (Extremes *extremes, bool useCorrected, bool forceValue)
       // be called. We ignore the minimal width then.
       if (extremes) {
          if (useCorrected)
-            minWidth =
-               misc::max (extremes->minWidth, extremes->minWidthIntrinsic);
+            minWidth = extremes->adjustmentWidth;
          else
-            minWidth = extremes->minWidthIntrinsic;
+            // UseCorrected is set to false when called for the
+            // correction of extemes. This is not supported anymore,
+            // so we return 0. TODO: Should be cleaned up again.
+            minWidth = 0;
       } else
          minWidth = 0;
    } else
@@ -932,6 +934,7 @@ void Widget::getExtremes (Extremes *extremes)
       DBG_OBJ_SET_NUM ("extremes.maxWidth", extremes->maxWidth);
       DBG_OBJ_SET_NUM ("extremes.maxWidthIntrinsic",
                        extremes->maxWidthIntrinsic);
+      DBG_OBJ_SET_NUM ("extremes.adjustmentWidth", extremes->adjustmentWidth);
    } else
       *extremes = this->extremes;
 
-- 
cgit v1.2.3