aboutsummaryrefslogtreecommitdiff
path: root/dw/table.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-10-03 01:59:41 +0200
committerSebastian Geerken <devnull@localhost>2014-10-03 01:59:41 +0200
commitfa01703ead5b5c92badfd3f381314ebcb16d5c42 (patch)
treebf66c40b8ee8da49bf914524945fdc54e0eabdb0 /dw/table.cc
parentf8fd2e3c4cb25c37b85552fbcad0bf5fb740ab8a (diff)
Fixed 'adjust_table_min_width'.
Diffstat (limited to 'dw/table.cc')
-rw-r--r--dw/table.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/dw/table.cc b/dw/table.cc
index b4a9adb6..661b8a11 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -737,15 +737,13 @@ void Table::forceCalcCellSizes (bool calcHeights)
// width for correction.
int corrWidth =
Table::getAdjustTableMinWidth () ? extremes.minWidthIntrinsic : 0;
- int totalWidth =
- misc::max (availWidth - ((numCols + 1) * getStyle()->hBorderSpacing
- + boxDiffWidth ()),
- corrWidth);
-
+ int totalWidth = misc::max (availWidth, corrWidth)
+ - ((numCols + 1) * getStyle()->hBorderSpacing + boxDiffWidth ());
+
DBG_OBJ_MSGF ("resize", 1,
- "totalWidth = max (%d - ((%d - 1) * %d + %d), %d) = <b>%d</b>",
- availWidth, numCols, getStyle()->hBorderSpacing,
- boxDiffWidth (), corrWidth, totalWidth);
+ "totalWidth = max (%d, %d) - ((%d - 1) * %d + %d) = <b>%d</b>",
+ availWidth, corrWidth, numCols, getStyle()->hBorderSpacing,
+ boxDiffWidth (), totalWidth);
colWidths->setSize (numCols, 0);
cumHeight->setSize (numRows + 1, 0);