summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2015-10-09 22:10:28 +0200
committerSebastian Geerken <devnull@localhost>2015-10-09 22:10:28 +0200
commit01c1c4d5322f70d55a42a09c5eddc76a1a44241d (patch)
treebd88f66b87c8a11f8de2004ef314828926cd2656
parent00b25efd6ec737148de06328260bbbf12ad2bd52 (diff)
SRDOP: More cleanup.
-rw-r--r--dw/ooffloatsmgr.cc10
-rw-r--r--dw/ooffloatsmgr.hh1
2 files changed, 1 insertions, 10 deletions
diff --git a/dw/ooffloatsmgr.cc b/dw/ooffloatsmgr.cc
index ac325b1b..3546d05c 100644
--- a/dw/ooffloatsmgr.cc
+++ b/dw/ooffloatsmgr.cc
@@ -332,7 +332,6 @@ OOFFloatsMgr::OOFFloatsMgr (OOFAwareWidget *container, int oofmIndex)
leftFloatsMark = rightFloatsMark = 0;
lastLeftTBIndex = lastRightTBIndex = 0;
- containerWasAllocated = container->wasAllocated ();
containerAllocation = *(container->getAllocation());
addWidgetInFlow (this->container, NULL, 0);
@@ -362,15 +361,8 @@ void OOFFloatsMgr::sizeAllocateStart (OOFAwareWidget *caller,
caller, allocation->x, allocation->y, allocation->width,
allocation->ascent, allocation->descent);
- if (caller == container) {
- // In the size allocation process, the *first* OOFM method
- // called is sizeAllocateStart, with the containing block as an
- // argument. So this is the correct point to initialize size
- // allocation.
-
- containerWasAllocated = true;
+ if (caller == container)
containerAllocation = *allocation;
- }
DBG_OBJ_LEAVE ();
}
diff --git a/dw/ooffloatsmgr.hh b/dw/ooffloatsmgr.hh
index 11cbeef4..2adb1c08 100644
--- a/dw/ooffloatsmgr.hh
+++ b/dw/ooffloatsmgr.hh
@@ -24,7 +24,6 @@ private:
OOFAwareWidget *container;
int oofmIndex;
- bool containerWasAllocated;
core::Allocation containerAllocation;
class WidgetInfo: public lout::object::Object