diff options
| author | Sebastian Geerken <devnull@localhost> | 2016-06-26 01:44:33 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2016-06-26 01:44:33 +0200 |
| commit | 69a3cd0edb23470da3fd1079196936a02591f35f (patch) | |
| tree | 0a570069278b6521792b5006b598193246fa5b3a /dw/ooffloatsmgr.cc | |
| parent | 29f65909079b027a1e8f81ed6a8c7b46a97e5ef1 (diff) | |
Simplify again the signature of OOFAwareWidget:getGeneratorWidth(), with a slightly more complex (but more correct) implementatin for Textblock.
Diffstat (limited to 'dw/ooffloatsmgr.cc')
| -rw-r--r-- | dw/ooffloatsmgr.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dw/ooffloatsmgr.cc b/dw/ooffloatsmgr.cc index 0d701b0b..9b754fff 100644 --- a/dw/ooffloatsmgr.cc +++ b/dw/ooffloatsmgr.cc @@ -476,7 +476,7 @@ int OOFFloatsMgr::calcFloatX (Float *vloat) // (ii) If there is more than one line, the line break will already be // exceeded, and so be smaller that GB width + float width. effGeneratorWidth = - min (vloat->generator->getGeneratorWidth (0, 0) + vloat->size.width, + min (vloat->generator->getGeneratorWidth () + vloat->size.width, vloat->generator->getMaxGeneratorWidth ()); x = max (generator->getGeneratorX (oofmIndex) + effGeneratorWidth @@ -868,7 +868,7 @@ bool OOFFloatsMgr::collidesH (Float *vloat, Float *other) if (vloat->generator == other->generator) collidesH = vloat->size.width + other->size.width + vloat->generator->boxDiffWidth() - > vloat->generator->getGeneratorWidth (0, 0); + > vloat->generator->getGeneratorWidth (); else { // Again, if the other float is not allocated, there is no // collision. Compare to collidesV. (But vloat->size is used @@ -1039,8 +1039,8 @@ void OOFFloatsMgr::getFloatsExtremes (Extremes *cbExtr, Side side, *maxWidth = max (*maxWidth, extr.maxWidth + vloat->generator->getStyle()->boxDiffWidth(), - + max (container->getGeneratorWidth (0, 0) - - vloat->generator->getGeneratorWidth (0, 0), + + max (container->getGeneratorWidth () + - vloat->generator->getGeneratorWidth (), 0)); DBG_OBJ_MSGF ("resize.oofm", 1, "%d / %d => %d / %d", |