From c989be311298e3b120cce43f3483c7c583d4d56c Mon Sep 17 00:00:00 2001
From: Sebastian Geerken <devnull@localhost>
Date: Mon, 28 Dec 2015 14:35:37 +0100
Subject: SRDOP: Correct y position passed by Textblock (plus RTFL messages).

---
 dw/textblock.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'dw/textblock.cc')

diff --git a/dw/textblock.cc b/dw/textblock.cc
index 9a606675..b02173bd 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -2276,9 +2276,15 @@ bool Textblock::calcSizeOfWidgetInFlow (int wordIndex, Widget *widget,
       int xRel = boxOffsetX () + leftInnerPadding
          + (lines->size () == 0 ? line1OffsetEff : 0);
       int lastMargin, yLine = yOffsetOfLineToBeCreated (&lastMargin);
-      int yRel = yLine - lastMargin
-         + max (lastMargin, widget->getStyle()->margin.top);
+      int yRel = yLine - min (lastMargin, widget->getStyle()->margin.top);
 
+      DBG_OBJ_MSGF ("resize", 1,
+                    "xRel = %d + %d + (%d == 0 ? %d : 0) = %d, "
+                    "yRel = %d - min (%d, %d) = %d",
+                    boxOffsetX (), leftInnerPadding , lines->size (),
+                    line1OffsetEff, xRel, yLine, lastMargin,
+                    widget->getStyle()->margin.top, yRel);
+            
       core::SizeParams childParams;
       DBG_OBJ_ASSOC_CHILD (&childParams);
 
-- 
cgit v1.2.3