From cfa111155ace132ea87a3d1ff33e3a1881793f3f Mon Sep 17 00:00:00 2001 From: Sebastian Geerken Date: Wed, 10 Apr 2013 15:31:21 +0200 Subject: Float::sideSpanningIndex --- dw/outofflowmgr.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dw/outofflowmgr.hh') diff --git a/dw/outofflowmgr.hh b/dw/outofflowmgr.hh index 891581dd..5a0ac34c 100644 --- a/dw/outofflowmgr.hh +++ b/dw/outofflowmgr.hh @@ -34,7 +34,7 @@ private: core::Widget *widget; Textblock *generatingBlock; int yReq, yReal; // relative to generator, not container - int index, mark; + int index, sideSpanningIndex, mark; core::Requisition size; bool dirty; @@ -143,7 +143,7 @@ private: Float *findFloatByWidget (core::Widget *widget); - void moveFromGBToCB (Side side); + void moveFromGBToCB (Side side, int offsetSideSpanningIndex); void sizeAllocateFloats (Side side); bool isTextblockCoveredByFloats (Textblock *tb, int tbx, int tby, int tbWidth, int tbHeight, int *floatPos, -- cgit v1.2.3