Size of inline-blocks with right floats is now calculated correctly.

1 files changed, 16 insertions, 16 deletions

diff --git a/dw/textblock.hh b/dw/textblock.hh
index 481317fb..6c80c474 100644
--- a/dw/textblock.hh
+++ b/dw/textblock.hh
@@ -841,22 +841,6 @@ protected:
                        core::Requisition *wordSize);
    static bool isContainingBlock (Widget *widget);
 
-   inline bool mustBeWidenedToAvailWidth () {
-      DBG_OBJ_ENTER0 ("resize", 0, "mustBeWidenedToAvailWidth");
-      bool toplevel = getParent () == NULL,
-         block = getStyle()->display == core::style::DISPLAY_BLOCK,
-         listitem = getStyle()->display == core::style::DISPLAY_LIST_ITEM,
-         vloat = getStyle()->vloat != core::style::FLOAT_NONE,
-         result =  toplevel || ((block || listitem) && !vloat);
-      DBG_OBJ_MSGF ("resize", 0,
-                    "=> %s (toplevel: %s, block: %s, listitem: %s, float: %s)",
-                    result ? "true" : "false", toplevel ? "true" : "false",
-                    block ? "true" : "false", listitem ? "true" : "false",
-                    vloat ? "true" : "false");
-      DBG_OBJ_LEAVE ();
-      return result;
-   }
-
 public:
    static int CLASS_ID;
 
@@ -892,6 +876,22 @@ public:
    void changeWordStyle (int from, int to, core::style::Style *style,
                          bool includeFirstSpace, bool includeLastSpace);
 
+   inline bool mustBeWidenedToAvailWidth () {
+      DBG_OBJ_ENTER0 ("resize", 0, "mustBeWidenedToAvailWidth");
+      bool toplevel = getParent () == NULL,
+         block = getStyle()->display == core::style::DISPLAY_BLOCK,
+         listitem = getStyle()->display == core::style::DISPLAY_LIST_ITEM,
+         vloat = getStyle()->vloat != core::style::FLOAT_NONE,
+         result =  toplevel || ((block || listitem) && !vloat);
+      DBG_OBJ_MSGF ("resize", 0,
+                    "=> %s (toplevel: %s, block: %s, listitem: %s, float: %s)",
+                    result ? "true" : "false", toplevel ? "true" : "false",
+                    block ? "true" : "false", listitem ? "true" : "false",
+                    vloat ? "true" : "false");
+      DBG_OBJ_LEAVE ();
+      return result;
+   }
+
    void borderChanged (int y, core::Widget *vloat);
    void clearPositionChanged ();
    void oofSizeChanged (bool extremesChanged);