aboutsummaryrefslogtreecommitdiff
path: root/dw
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2016-05-08 11:37:54 +0200
committerSebastian Geerken <devnull@localhost>2016-05-08 11:37:54 +0200
commite323b643a2b2bbbbe97fd3e2a235a02300bc449a (patch)
tree8242083b4a52d16054a62a60a0937d2aafe022bc /dw
parent84c45f26927c623f86a3f91f4842b0c1e81b9804 (diff)
Allow negative Textblock::getGeneratorWidth (fixes case of overlapping floats.
Diffstat (limited to 'dw')
-rw-r--r--dw/textblock.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 6d2d91ae..13df376c 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -3061,9 +3061,7 @@ int Textblock::getGeneratorRest (int oofmIndex)
OOFAwareWidget *container = oofContainer[oofmIndex];
if (container != NULL && findSizeRequestReference (container, &xRef, NULL))
- rest = misc::max (container->getGeneratorWidth ()
- - (xRef + getGeneratorWidth ()),
- 0);
+ rest = container->getGeneratorWidth () - (xRef + getGeneratorWidth ());
else {
// Only callend for floats, so this should not happen:
assertNotReached ();