New dillorc option adjust_table_min_width.

4 files changed, 10 insertions, 3 deletions

diff --git a/dw/table.cc b/dw/table.cc
index 5df366a4..6b3ae804 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -28,6 +28,7 @@ using namespace lout;
 
 namespace dw {
 
+bool Table::adjustTableMinWidth = true;
 int Table::CLASS_ID = -1;
 
 Table::Table(bool limitTextWidth)
diff --git a/dw/table.hh b/dw/table.hh
index 96769f40..109bbf30 100644
--- a/dw/table.hh
+++ b/dw/table.hh
@@ -322,7 +322,6 @@ namespace dw {
 class Table: public core::Widget
 {
 private:
-
    struct Child
    {
       enum {
@@ -361,6 +360,8 @@ private:
 
    friend class TableIterator;
 
+   static bool adjustTableMinWidth;
+
    bool limitTextWidth, rowClosed;
 
    int numRows, numCols, curRow, curCol;
@@ -463,6 +464,8 @@ protected:
    void sizeAllocateImpl (core::Allocation *allocation);
    void resizeDrawImpl ();
 
+   bool getAdjustMinWidth () { return Table::adjustTableMinWidth; }
+
    int getAvailWidthOfChild (Widget *child, bool forceValue);
    void correctRequisitionOfChild (core::Widget *child,
                                    core::Requisition *requisition,
@@ -485,6 +488,9 @@ protected:
 public:
    static int CLASS_ID;
 
+   inline static void setAdjustTableMinWidth (bool adjustTableMinWidth)
+   { Table::adjustTableMinWidth = adjustTableMinWidth; }
+
    Table(bool limitTextWidth);
    ~Table();
 
diff --git a/dw/widget.cc b/dw/widget.cc
index 362dc56e..5620ebdb 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -524,7 +524,7 @@ int Widget::getMinWidth (Extremes *extremes, bool forceValue)
                   forceValue ? "true" : "false");
    int minWidth;
 
-   if (adjustMinWidth) {
+   if (getAdjustMinWidth ()) {
       Extremes extremes2;
       if (extremes == NULL) {
          if (forceValue) {
diff --git a/dw/widget.hh b/dw/widget.hh
index 4aa8d5de..d6251f4f 100644
--- a/dw/widget.hh
+++ b/dw/widget.hh
@@ -389,7 +389,6 @@ public:
 
    inline static void setAdjustMinWidth (bool adjustMinWidth)
    { Widget::adjustMinWidth = adjustMinWidth; }
-   inline static bool getAdjustMinWidth () { return Widget::adjustMinWidth; }
 
    Widget ();
    ~Widget ();
@@ -428,6 +427,7 @@ public:
 
    int getAvailWidth (bool forceValue);
    int getAvailHeight (bool forceValue);
+   virtual bool getAdjustMinWidth () { return Widget::adjustMinWidth; }
    void correctRequisition (Requisition *requisition,
                             void (*splitHeightFun) (int, int*, int*));
    void correctExtremes (Extremes *extremes);