summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2016-03-26 23:19:42 +0100
committerSebastian Geerken <devnull@localhost>2016-03-26 23:19:42 +0100
commit639fbbfd350e32ab128482078d83a05a3f208983 (patch)
tree892a23e6a757f3b23bc633d1342a031ea5efc19b
parentec1fc5e6aec8d4020eef89df8cf22235059ef11e (diff)
RTFL.
-rw-r--r--dw/imgbuf.hh4
-rw-r--r--dw/ooffloatsmgr.cc13
-rw-r--r--dw/widget.cc5
3 files changed, 16 insertions, 6 deletions
diff --git a/dw/imgbuf.hh b/dw/imgbuf.hh
index f9870bcf..e2b592e5 100644
--- a/dw/imgbuf.hh
+++ b/dw/imgbuf.hh
@@ -169,6 +169,10 @@ public:
DBG_OBJ_BASECLASS (lout::signal::ObservedObject);
}
+ inline ~Imgbuf () {
+ DBG_OBJ_DELETE ();
+ }
+
/*
* Methods called from the image decoding
*/
diff --git a/dw/ooffloatsmgr.cc b/dw/ooffloatsmgr.cc
index 5ea648b6..5c704ee9 100644
--- a/dw/ooffloatsmgr.cc
+++ b/dw/ooffloatsmgr.cc
@@ -651,10 +651,11 @@ void OOFFloatsMgr::markSizeChange (int ref)
// The determination of the last element could perhaps be optimized, but we
// do not yet know the *new* height of the float.
int last = tbInfos->size () - 1;
- for (int i = first; i <= last; i++)
- tbInfos->get(i)->getOOFAwareWidget()->borderChanged (oofmIndex,
- vloat->yReal,
- vloat->getWidget ());
+ for (int i = first; i <= last; i++) {
+ OOFAwareWidget *oofaw = tbInfos->get(i)->getOOFAwareWidget();
+ DBG_OBJ_MSGF ("resize.oofm", 1, "calling borderChanged for %p", oofaw);
+ oofaw->borderChanged (oofmIndex, vloat->yReal, vloat->getWidget ());
+ }
DBG_OBJ_LEAVE ();
}
@@ -664,7 +665,7 @@ void OOFFloatsMgr::markSizeChange (int ref)
*/
int OOFFloatsMgr::findTBInfo (int y)
{
- DBG_OBJ_ENTER_O ("findTBInfo", 0, oofm, "findTBInfo", "%d", y);
+ DBG_OBJ_ENTER ("findTBInfo", 0, "findTBInfo", "%d", y);
TBInfo key (this, NULL, NULL, 0);
key.y = y;
@@ -675,7 +676,7 @@ int OOFFloatsMgr::findTBInfo (int y)
// is less or equal.
int result = index > 0 ? index - 1 : index;
- DBG_OBJ_LEAVE_VAL_O (oofm, "%d", result);
+ DBG_OBJ_LEAVE_VAL ("%d", result);
return result;
}
diff --git a/dw/widget.cc b/dw/widget.cc
index 785cb5ff..776c3f88 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -415,6 +415,11 @@ void Widget::actualQueueResize (int ref, bool extremesChanged, bool fast)
} else {
for (widget2 = parent, child = this; widget2;
child = widget2, widget2 = widget2->parent) {
+ // TODO Could the following code be used for optimization?
+ //if (widget2->resizeQueued () &&
+ // (widget2->extremesQueued () || !extremesChanged))
+ // break;
+
if (layout && !widget2->resizeQueued ())
layout->queueResizeList->put (widget2);