aboutsummaryrefslogtreecommitdiff
path: root/dw/outofflowmgr.hh
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-04-11 23:54:03 +0200
committerSebastian Geerken <devnull@localhost>2014-04-11 23:54:03 +0200
commit37bf6f1cc340018b9639bb290f2eada9e87630ee (patch)
tree790b0b69aedf7e525f59f9d334ea3e4c40d0694d /dw/outofflowmgr.hh
parent5c6a11eadf8e490db851f4fb6763598d213946dd (diff)
Corrected float allocation order again.
Diffstat (limited to 'dw/outofflowmgr.hh')
-rw-r--r--dw/outofflowmgr.hh6
1 files changed, 5 insertions, 1 deletions
diff --git a/dw/outofflowmgr.hh b/dw/outofflowmgr.hh
index 6dd49361..9d6e9e98 100644
--- a/dw/outofflowmgr.hh
+++ b/dw/outofflowmgr.hh
@@ -228,6 +228,10 @@ private:
// allocated.
SortedFloatsVector *leftFloatsCB, *rightFloatsCB;
+ // These two attributes are used in the size allocation process;
+ // see sizeAllocateStart and sizeAllocateEnd.
+ int lastAllocatedLeftFloat, lastAllocatedRightFloat;
+
lout::container::typed::HashTable<lout::object::TypedPointer
<dw::core::Widget>, Float> *floatsByWidget;
@@ -260,7 +264,7 @@ private:
Float *findFloatByWidget (core::Widget *widget);
void moveFromGBToCB (Side side);
- void sizeAllocateFloats (TBInfo *textblock, Side side);
+ void sizeAllocateFloats (Side side, int newLastAllocatedFloat);
int calcFloatX (Float *vloat, Side side, int gbX, int gbWidth,
int gbAvailWidth);