aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-11-18 14:11:06 +0100
committerSebastian Geerken <devnull@localhost>2014-11-18 14:11:06 +0100
commitde2139f76ee1fa4f14970914bb6c87fe46feed17 (patch)
tree8bf33d9a900a22289552905292fe725e0d6ab5d8
parentd9fba2910501b62b73d375a8a5e67dea3f1deccf (diff)
Some cleanup.
-rw-r--r--dw/textblock.cc12
1 files changed, 3 insertions, 9 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 564493b9..c9709f4d 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -3167,16 +3167,10 @@ Textblock *Textblock::getTextblockForLine (int firstWord, int lastWord)
if (word->content.type == core::Content::WIDGET_IN_FLOW) {
Widget *widget = word->content.widget;
if (widget->instanceOf (Textblock::CLASS_ID) &&
- // Exclude some cases where a textblock constitutes a new
- // container (see definition of float container in
- // Textblock::isContainingBlock).
- widget->getStyle()->display != core::style::DISPLAY_INLINE_BLOCK &&
- widget->getStyle()->overflow == core::style::OVERFLOW_VISIBLE)
+ // Exclude cases where a textblock constitutes a new floats
+ // container.
+ !isOOFContainer (widget, OOFM_FLOATS))
textblock = (Textblock*)widget;
-
- // (TODO: It would look nicer if there is one common place
- // for such definitions. Will be fixed in "dillo_grows", not
- // here.)
}
}