Implemented Table::correctRequisitionOfChild.

1 files changed, 28 insertions, 1 deletions

diff --git a/dw/widget.cc b/dw/widget.cc
index ba2d8c8f..83c401a6 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -1292,7 +1292,21 @@ void Widget::correctRequisitionOfChild (Widget *child, Requisition *requisition,
    // TODO Correct by extremes?
 
    DBG_OBJ_ENTER ("resize", 0, "correctRequisitionOfChild",
-                  "%p, %d * (%d + %d), ...)",
+                  "%p, %d * (%d + %d), ...", child, requisition->width,
+                  requisition->ascent, requisition->descent);
+
+   correctReqWidthOfChild (child, requisition);
+   correctReqHeightOfChild (child, requisition, splitHeightFun);
+
+   DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
+                 requisition->width, requisition->ascent,
+                 requisition->descent);
+   DBG_OBJ_LEAVE ();
+}
+
+void Widget::correctReqWidthOfChild (Widget *child, Requisition *requisition)
+{
+   DBG_OBJ_ENTER ("resize", 0, "correctReqWidthOfChild", "%p, %d * (%d + %d)",
                   child, requisition->width, requisition->ascent,
                   requisition->descent);
 
@@ -1308,6 +1322,19 @@ void Widget::correctRequisitionOfChild (Widget *child, Requisition *requisition,
       }
    }
 
+   DBG_OBJ_MSGF ("resize", 1, "=> %d * (%d + %d)",
+                 requisition->width, requisition->ascent,
+                 requisition->descent);
+   DBG_OBJ_LEAVE ();
+}
+
+void Widget::correctReqHeightOfChild (Widget *child, Requisition *requisition,
+                                      void (*splitHeightFun) (int, int*, int*))
+{
+   DBG_OBJ_ENTER ("resize", 0, "correctReqHeightOfChild",
+                  "%p, %d * (%d + %d), ...", child, requisition->width,
+                  requisition->ascent, requisition->descent);
+
    // TODO Perhaps split first, then add box ascent and descent.
    if (style::isAbsLength (child->getStyle()->height))
       splitHeightFun (style::absLengthVal (child->getStyle()->height)