1 files changed, 12 insertions, 0 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 2ed05b1d..fd743c21 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -2128,6 +2128,10 @@ void Textblock::addLinebreak (core::style::Style *style)
  */
 core::Widget  *Textblock::getWidgetAtPoint(int x, int y, int level)
 {
+   //printf ("%*s-> examining the %s %p (%d, %d, %d x (%d + %d))\n",
+   //        3 * level, "", getClassName (), this, allocation.x, allocation.y,
+   //        allocation.width, allocation.ascent, allocation.descent);
+
    int lineIndex, wordIndex;
    Line *line;
 
@@ -2138,6 +2142,14 @@ core::Widget  *Textblock::getWidgetAtPoint(int x, int y, int level)
       return NULL;
    }
 
+   // First, search for widgets out of flow, notably floats, since
+   // there are cases where they overlap child textblocks. Should
+   // later be refined using z-index.
+   Widget *oofWidget =
+      outOfFlowMgr ? outOfFlowMgr->getWidgetAtPoint (x, y, level) : NULL;
+   if (oofWidget)
+      return oofWidget;
+
    lineIndex = findLineIndex (y - allocation.y);
 
    if (lineIndex < 0 || lineIndex >= lines->size ()) {