Table gets OOF aware, part 1. Warning: crashes!

1 files changed, 14 insertions, 0 deletions

diff --git a/dw/table.cc b/dw/table.cc
index 746856c7..a59c0120 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -124,6 +124,9 @@ void Table::sizeRequestImpl (core::Requisition *requisition)
 
    correctRequisition (requisition, core::splitHeightPreserveDescent);
 
+   // For the order, see similar reasoning for dw::Textblock.
+   correctRequisitionByOOF (requisition);
+
    DBG_OBJ_LEAVE ();
 }
 
@@ -152,6 +155,9 @@ void Table::getExtremesImpl (core::Extremes *extremes)
 
    correctExtremes (extremes);
 
+   // For the order, see similar reasoning for dw::Textblock.
+   correctExtremesByOOF (extremes);
+
    DBG_OBJ_LEAVE ();
 }
 
@@ -161,6 +167,8 @@ void Table::sizeAllocateImpl (core::Allocation *allocation)
                   allocation->x, allocation->y, allocation->width,
                   allocation->ascent, allocation->descent);
 
+   sizeAllocateStart (allocation);
+
    calcCellSizes (true);
 
    /**
@@ -201,6 +209,8 @@ void Table::sizeAllocateImpl (core::Allocation *allocation)
       x += colWidths->get (col) + getStyle()->hBorderSpacing;
    }
 
+   sizeAllocateEnd ();
+
    DBG_OBJ_LEAVE ();
 }
 
@@ -306,6 +316,8 @@ void Table::containerSizeChangedForChildren ()
       }
    }
 
+   containerSizeChangedForChildrenOOF ();
+
    DBG_OBJ_LEAVE ();
 }
 
@@ -371,6 +383,8 @@ void Table::draw (core::View *view, core::Rectangle *area)
             child->draw (view, &childArea);
       }
    }
+
+   drawOOF (view, area);
 }
 
 void Table::removeChild (Widget *child)