diff options
Diffstat (limited to 'dw/oofawarewidget.cc')
| -rw-r--r-- | dw/oofawarewidget.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/dw/oofawarewidget.cc b/dw/oofawarewidget.cc index 11a4615d..f8e3c497 100644 --- a/dw/oofawarewidget.cc +++ b/dw/oofawarewidget.cc @@ -187,11 +187,21 @@ void OOFAwareWidget::correctRequisitionByOOF (Requisition *requisition, outOfFlowMgr[i]->getSize (requisition, &oofWidth, &oofHeight); - if (oofWidth > requisition->width) + if (oofWidth > requisition->width) { + if (adjustExtraSpaceWhenCorrectingRequisitionByOOF ()) + extraSpace.right = max (extraSpace.right, + oofWidth - requisition->width); requisition->width = oofWidth; - if (oofHeight > requisition->ascent + requisition->descent) + } + + if (oofHeight > requisition->ascent + requisition->descent) { + if (adjustExtraSpaceWhenCorrectingRequisitionByOOF ()) + extraSpace.bottom = max (extraSpace.bottom, + oofHeight - (requisition->ascent + + requisition->descent)); splitHeightFun (oofHeight, &requisition->ascent, &requisition->descent); + } } } } @@ -323,6 +333,11 @@ bool OOFAwareWidget::isPossibleContainerParent (int oofmIndex) return oofmIndex != OOFM_FLOATS; } +bool OOFAwareWidget::adjustExtraSpaceWhenCorrectingRequisitionByOOF () +{ + return true; +} + } // namespace oof } // namespace dw |