diff options
Diffstat (limited to 'dw')
| -rw-r--r-- | dw/table.cc | 14 | ||||
| -rw-r--r-- | dw/table.hh | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dw/table.cc b/dw/table.cc index 746856c7..b4a9adb6 100644 --- a/dw/table.cc +++ b/dw/table.cc @@ -733,13 +733,19 @@ void Table::forceCalcCellSizes (bool calcHeights) getExtremes (&extremes); int availWidth = getAvailWidth (true); - int totalWidth = availWidth - - ((numCols + 1) * getStyle()->hBorderSpacing + boxDiffWidth ()); + // When adjust_table_min_width is set, use the minimal (intrinsic) + // width for correction. + int corrWidth = + Table::getAdjustTableMinWidth () ? extremes.minWidthIntrinsic : 0; + int totalWidth = + misc::max (availWidth - ((numCols + 1) * getStyle()->hBorderSpacing + + boxDiffWidth ()), + corrWidth); DBG_OBJ_MSGF ("resize", 1, - "totalWidth = %d - ((%d - 1) * %d + %d) = <b>%d</b>", + "totalWidth = max (%d - ((%d - 1) * %d + %d), %d) = <b>%d</b>", availWidth, numCols, getStyle()->hBorderSpacing, - boxDiffWidth (), totalWidth); + boxDiffWidth (), corrWidth, totalWidth); colWidths->setSize (numCols, 0); cumHeight->setSize (numRows + 1, 0); diff --git a/dw/table.hh b/dw/table.hh index a8823ca0..1e7c5268 100644 --- a/dw/table.hh +++ b/dw/table.hh @@ -488,7 +488,7 @@ public: inline static void setAdjustTableMinWidth (bool adjustTableMinWidth) { Table::adjustTableMinWidth = adjustTableMinWidth; } - inline static int getAdjustTableMinWidth () + inline static bool getAdjustTableMinWidth () { return Table::adjustTableMinWidth; } Table(bool limitTextWidth); |