diff options
| author | Sebastian Geerken <devnull@localhost> | 2015-06-10 22:57:53 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2015-06-10 22:57:53 +0200 |
| commit | 9500f94781023d15783f4c8158c17c112135a221 (patch) | |
| tree | 4643fdf41a681b3b8e6e336d2f13258478b82cde /dw/textblock.cc | |
| parent | 22ad8daa0b3e6b20e911e12e0f0e657b52303698 (diff) | |
SRDOP: Work on RTFL messages.
Diffstat (limited to 'dw/textblock.cc')
| -rw-r--r-- | dw/textblock.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc index 8ccaf74b..2086a7f4 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -218,7 +218,7 @@ Textblock::Textblock (bool limitTextWidth) lastWordDrawn = -1; DBG_OBJ_SET_NUM ("lastWordDrawn", lastWordDrawn); - DBG_SET_SIZE_PARAMS ("sizeRequestParams", sizeRequestParams); + DBG_OBJ_ASSOC_CHILD (&sizeRequestParams); /* * The initial sizes of lines and words should not be @@ -302,10 +302,9 @@ Textblock::~Textblock () void Textblock::sizeRequestImpl (core::Requisition *requisition, int numPos, Widget **references, int *x, int *y) { - DBG_OBJ_ENTER0 ("resize", 0, "sizeRequestImpl"); + DBG_OBJ_ENTER ("resize", 0, "sizeRequestImpl", "%d, ...", numPos); sizeRequestParams.fill (numPos, references, x, y); - DBG_SET_SIZE_PARAMS ("sizeRequestParams", sizeRequestParams); int newLineBreakWidth = getAvailWidth (true); if (newLineBreakWidth != lineBreakWidth) { @@ -2304,6 +2303,8 @@ bool Textblock::calcSizeOfWidgetInFlow (int wordIndex, Widget *widget, + max (lastMargin, widget->getStyle()->margin.top); core::SizeParams childParams; + DBG_OBJ_ASSOC_CHILD (&childParams); + sizeRequestParams.forChild (this, widget, xRel, yRel, &childParams); widget->sizeRequest (size, childParams.getNumPos (), childParams.getReferences (), childParams.getX (), |