From a8058f6e474f42faea7bc2d632d7b13754ba40ad Mon Sep 17 00:00:00 2001 From: Sebastian Geerken Date: Fri, 26 Sep 2014 17:35:12 +0200 Subject: More RTFL. --- dw/textblock.cc | 4 ++++ dw/textblock_iterator.cc | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dw/textblock.cc b/dw/textblock.cc index 674c83b9..b31cbfbd 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -2812,6 +2812,8 @@ void Textblock::changeWordStyle (int from, int to, core::style::Style *style, void Textblock::queueDrawRange (int index1, int index2) { + DBG_OBJ_ENTER ("draw", 0, "queueDrawRange", "%d, %d", index1, index2); + int from = misc::min (index1, index2); int to = misc::max (index1, index2); @@ -2833,6 +2835,8 @@ void Textblock::queueDrawRange (int index1, int index2) queueDrawArea (0, y, allocation.width, h); } + + DBG_OBJ_LEAVE (); } void Textblock::setClearPosition (int clearPosition) diff --git a/dw/textblock_iterator.cc b/dw/textblock_iterator.cc index 6eb8d9a3..a0eb1bf4 100644 --- a/dw/textblock_iterator.cc +++ b/dw/textblock_iterator.cc @@ -59,10 +59,19 @@ object::Object *Textblock::TextblockIterator::clone() void Textblock::TextblockIterator::highlight (int start, int end, core::HighlightLayer layer) { + DBG_OBJ_ENTER_O ("iterator", 0, getWidget (), "TextblockIterator/highlight", + "..., %d, %d, %d", start, end, layer); + + DBG_IF_RTFL { + misc::StringBuffer sb; + intoStringBuffer (&sb); + DBG_OBJ_MSGF_O ("iterator", 1, getWidget (), "iterator: %s", + sb.getChars ()); + } + if (inFlow ()) { - DBG_OBJ_ENTER_O ("events", 0, getWidget (), "TextblockIterator/highlight", - "[in flow: %d], %d, %d, %d", getInFlowIndex (), - start, end, layer); + DBG_OBJ_MSGF_O ("iterator", 1, getWidget (), "in-flow index: %d", + getInFlowIndex ()); Textblock *textblock = (Textblock*)getWidget(); int index = getInFlowIndex (), index1 = index, index2 = index; @@ -104,19 +113,29 @@ void Textblock::TextblockIterator::highlight (int start, int end, oldEndIndex != textblock->hlEnd[layer].index || oldEndChar != textblock->hlEnd[layer].nChar) textblock->queueDrawRange (index1, index2); - - DBG_OBJ_LEAVE_O (getWidget ()); } else highlightOOF (start, end, layer); + + DBG_OBJ_LEAVE_O (getWidget ()); } void Textblock::TextblockIterator::unhighlight (int direction, core::HighlightLayer layer) { + DBG_OBJ_ENTER_O ("iterator", 0, getWidget (), + "TextblockIterator/unhighlight", "..., %d, %d", + direction, layer); + + DBG_IF_RTFL { + misc::StringBuffer sb; + intoStringBuffer (&sb); + DBG_OBJ_MSGF_O ("iterator", 1, getWidget (), "iterator: %s", + sb.getChars ()); + } + if (inFlow ()) { - DBG_OBJ_ENTER_O ("events", 0, getWidget (), - "TextblockIterator/unhighlight", "[in flow: %d], %d, %d", - getInFlowIndex (), direction, layer); + DBG_OBJ_MSGF_O ("iterator", 1, getWidget (), "in-flow index: %d", + getInFlowIndex ()); Textblock *textblock = (Textblock*)getWidget(); int index = getInFlowIndex (), index1 = index, index2 = index; @@ -158,10 +177,10 @@ void Textblock::TextblockIterator::unhighlight (int direction, oldEndIndex != textblock->hlEnd[layer].index || oldEndChar != textblock->hlEnd[layer].nChar) textblock->queueDrawRange (index1, index2); - - DBG_OBJ_LEAVE_O (getWidget ()); } else unhighlightOOF (direction, layer); + + DBG_OBJ_LEAVE_O (getWidget ()); } void Textblock::TextblockIterator::getAllocation (int start, int end, -- cgit v1.2.3