From d2301b7b883f577707b353f9544702dce203ff1b Mon Sep 17 00:00:00 2001 From: Sebastian Geerken Date: Tue, 23 Sep 2014 14:24:33 +0200 Subject: OOFAwareWidget::correctRequisitionByOOF: use splitHeightFun. --- dw/oofawarewidget.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'dw/oofawarewidget.cc') diff --git a/dw/oofawarewidget.cc b/dw/oofawarewidget.cc index 7d3b9d7b..11a4615d 100644 --- a/dw/oofawarewidget.cc +++ b/dw/oofawarewidget.cc @@ -173,7 +173,9 @@ void OOFAwareWidget::initOutOfFlowMgrs () } } -void OOFAwareWidget::correctRequisitionByOOF (Requisition *requisition) +void OOFAwareWidget::correctRequisitionByOOF (Requisition *requisition, + void (*splitHeightFun) (int, int*, + int*)) { for (int i = 0; i < NUM_OOFM; i++) { if (outOfFlowMgr[i]) { @@ -188,7 +190,8 @@ void OOFAwareWidget::correctRequisitionByOOF (Requisition *requisition) if (oofWidth > requisition->width) requisition->width = oofWidth; if (oofHeight > requisition->ascent + requisition->descent) - requisition->descent = oofHeight - requisition->ascent; + splitHeightFun (oofHeight, + &requisition->ascent, &requisition->descent); } } } -- cgit v1.2.3