Merge chaos?

1 files changed, 15 insertions, 15 deletions

diff --git a/dw/textblock.cc b/dw/textblock.cc
index c5550d5f..59817bdd 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -689,24 +689,24 @@ int Textblock::getAvailWidthOfChild (Widget *child, bool forceValue)
 
    int width;
 
-   if (child->getStyle()->width == core::style::LENGTH_AUTO) {
-      // No width specified: similar to standard implementation (see
-      // there), but "leftInnerPadding" has to be considered, too.
-      DBG_OBJ_MSG ("resize", 1, "no specification");
-      if (forceValue)
-         width = misc::max (getAvailWidth (true) - boxDiffWidth ()
-                            - leftInnerPadding,
-                            0);
-      else
-         width = -1;
-   } else
-      width = Widget::getAvailWidthOfChild (child, forceValue);
-
-   if (isWidgetOOF(child) && getWidgetOutOfFlowMgr(child) &&
+   if (isWidgetOOF (child) && getWidgetOutOfFlowMgr(child) &&
        getWidgetOutOfFlowMgr(child)->dealingWithSizeOfChild (child))
       width =
-         getWidgetOutOfFlowMgr(child)->getAvailWidthOfChild (child, forceValue);
+         getWidgetOutOfFlowMgr(child)->getAvailWidthOfChild (child,forceValue);
    else {
+      if (child->getStyle()->width == core::style::LENGTH_AUTO) {
+         // No width specified: similar to standard implementation (see
+         // there), but "leftInnerPadding" has to be considered, too.
+         DBG_OBJ_MSG ("resize", 1, "no specification");
+         if (forceValue)
+            width = misc::max (getAvailWidth (true) - boxDiffWidth ()
+                               - leftInnerPadding,
+                               0);
+         else
+            width = -1;
+      } else
+         width = Widget::getAvailWidthOfChild (child, forceValue);
+      
       if (forceValue && this == child->getContainer () &&
           !mustBeWidenedToAvailWidth ()) {
          core::Extremes extremes;