GROWS: new options allowDecreaseWidth and allowDecreaseHeight for size correction.

1 files changed, 16 insertions, 7 deletions

diff --git a/dw/simpletablecell.cc b/dw/simpletablecell.cc
index 1466439b..a973ac30 100644
--- a/dw/simpletablecell.cc
+++ b/dw/simpletablecell.cc
@@ -21,9 +21,10 @@
 
 #include "simpletablecell.hh"
 #include "tablecell.hh"
-#include "../lout/misc.hh"
 #include "../lout/debug.hh"
 
+using namespace lout;
+
 namespace dw {
 
 int SimpleTableCell::CLASS_ID = -1;
@@ -85,15 +86,23 @@ void SimpleTableCell::correctRequisitionOfChild (Widget *child,
                                                  core::Requisition *requisition,
                                                  void (*splitHeightFun) (int,
                                                                          int*,
-                                                                         int*))
+                                                                         int*),
+                                                 bool allowDecreaseWidth,
+                                                 bool allowDecreaseHeight)
 {
    DBG_OBJ_ENTER ("resize", 0, "SimpleTableCell::correctRequisitionOfChild",
-                  "%p, %d * (%d + %d), ...", child, requisition->width,
-                  requisition->ascent, requisition->descent);
-
-   Textblock::correctRequisitionOfChild (child, requisition, splitHeightFun);
+                  "%p, %d * (%d + %d), ..., %s, %s", child, requisition->width,
+                  requisition->ascent, requisition->descent,
+                  misc::boolToStr (allowDecreaseWidth),
+                  misc::boolToStr (allowDecreaseHeight));
+
+   Textblock::correctRequisitionOfChild (child, requisition, splitHeightFun,
+                                         allowDecreaseWidth,
+                                         allowDecreaseHeight);
    tablecell::correctCorrectedRequisitionOfChild (this, child, requisition,
-                                                  splitHeightFun);
+                                                  splitHeightFun,
+                                                  allowDecreaseWidth,
+                                                  allowDecreaseHeight);
 
    DBG_OBJ_LEAVE ();
 }