summaryrefslogtreecommitdiff
path: root/dw/textblock.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2016-01-09 18:00:46 +0100
committerSebastian Geerken <devnull@localhost>2016-01-09 18:00:46 +0100
commitc122d6384e6197aa6fc2a0500dfb3271c44cd07a (patch)
tree01a88be6bdd928ade214883cfbdf96b3d0598d4b /dw/textblock.cc
parent9e5ef05a592d637f115b8a8b0b61da940d7bbbe4 (diff)
Widget::calcExtraSpace is only called for size, not for extremes.
Diffstat (limited to 'dw/textblock.cc')
-rw-r--r--dw/textblock.cc22
1 files changed, 10 insertions, 12 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 3b7479af..5c740b3d 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -738,25 +738,23 @@ void Textblock::sizeAllocateImpl (core::Allocation *allocation)
DBG_OBJ_LEAVE ();
}
-void Textblock::calcExtraSpaceImpl (bool vertical, int numPos,
- Widget **references, int *x, int *y)
+void Textblock::calcExtraSpaceImpl (int numPos, Widget **references, int *x,
+ int *y)
{
DBG_OBJ_ENTER0 ("resize", 0, "Textblock::calcExtraSpaceImpl");
sizeRequestParams.fill (numPos, references, x, y);
- OOFAwareWidget::calcExtraSpaceImpl (vertical, numPos, references, x, y);
+ OOFAwareWidget::calcExtraSpaceImpl (numPos, references, x, y);
- if (vertical) {
- int clearPosition = 0;
- for (int i = 0; i < NUM_OOFM; i++)
- if (searchOutOfFlowMgr (i) && findSizeRequestReference (i, NULL, NULL))
- clearPosition =
- misc::max (clearPosition,
- searchOutOfFlowMgr(i)->getClearPosition (this));
+ int clearPosition = 0;
+ for (int i = 0; i < NUM_OOFM; i++)
+ if (searchOutOfFlowMgr (i) && findSizeRequestReference (i, NULL, NULL))
+ clearPosition =
+ misc::max (clearPosition,
+ searchOutOfFlowMgr(i)->getClearPosition (this));
- extraSpace.top = misc::max (extraSpace.top, clearPosition);
- }
+ extraSpace.top = misc::max (extraSpace.top, clearPosition);
DBG_OBJ_LEAVE ();
}