diff options
author | Sebastian Geerken <devnull@localhost> | 2012-10-16 21:59:45 +0200 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2012-10-16 21:59:45 +0200 |
commit | f35b341720367f3f535a2b8c343fbbf75b3c4af1 (patch) | |
tree | 659385411411e5efe1265dd9840c319e53cd15b2 | |
parent | d2adf3767aa5b485ce21b006b50464c1f5a4c7fc (diff) |
Bug fix.
-rw-r--r-- | dw/textblock_linebreaking.cc | 3 | ||||
-rw-r--r-- | test/dw_float_test.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index b9b1a4c2..e865d1b6 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -486,8 +486,7 @@ void Textblock::wordWrap (int wordIndex, bool wrapAll) } containingBlock->outOfFlowMgr->tellPosition (word->content.widget, - allocation.y + top + getStyle()->boxOffsetY() - - containingBlock->getAllocation()->y); + diffYToContainingBlock () + top + getStyle()->boxOffsetY()); // TODO: compare old/new values of calcAvailWidth(...); diff --git a/test/dw_float_test.cc b/test/dw_float_test.cc index a3e91b6c..11d04984 100644 --- a/test/dw_float_test.cc +++ b/test/dw_float_test.cc @@ -135,7 +135,7 @@ int main(int argc, char **argv) window->resizable(viewport); window->show(); - //Fl::add_timeout (2, addTextToFloatTimeout, NULL); + Fl::add_timeout (2, addTextToFloatTimeout, NULL); int errorCode = Fl::run(); wordStyle->unref(); |