Merge with main repo.

1 files changed, 9 insertions, 0 deletions

diff --git a/dw/oofawarewidget.cc b/dw/oofawarewidget.cc
index 6e34b32f..c6b75306 100644
--- a/dw/oofawarewidget.cc
+++ b/dw/oofawarewidget.cc
@@ -339,6 +339,8 @@ void OOFAwareWidget::correctExtremesByOOF (Extremes *extremes)
          extremes->maxWidth = max (extremes->maxWidth, oofMaxWidth);
          extremes->maxWidthIntrinsic = max (extremes->maxWidthIntrinsic,
                                             oofMinWidth);
+         extremes->adjustmentWidth = max (extremes->adjustmentWidth,
+                                          oofMinWidth);
 
          DBG_OBJ_MSGF ("resize", 1, "after correction: %d (%d) / %d (%d)",
                        extremes->minWidth, extremes->minWidthIntrinsic,
@@ -809,6 +811,13 @@ Object *OOFAwareWidget::stackingIterator (bool atEnd)
    return new OOFStackingIterator (this, atEnd);
 }
 
+bool OOFAwareWidget::mustBeWidenedToAvailWidth ()
+{
+   // Only used for floats.
+   assertNotReached ();
+   return false;
+}
+
 void OOFAwareWidget::borderChanged (int y, Widget *vloat)
 {
    assertNotReached ();