Merge with main repo.

1 files changed, 8 insertions, 5 deletions

diff --git a/dw/textblock.hh b/dw/textblock.hh
index 4a8290a8..0834e183 100644
--- a/dw/textblock.hh
+++ b/dw/textblock.hh
@@ -854,18 +854,21 @@ protected:
       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 = testWidgetFloat (this),
          abspos = testWidgetAbsolutelyPositioned (this),
          fixpos = testWidgetFixedlyPositioned (this),
          // In detail, this depends on what the respective OOFM does
          // with the child widget:
-         result =  toplevel || (block && !(vloat || abspos || fixpos));
+         result =
+            toplevel || ((block || listitem) && !(vloat || abspos || fixpos));
       DBG_OBJ_MSGF ("resize", 0,
-                    "=> %s (toplevel: %s, block: %s, float: %s, abspos: %s, "
-                    "fixpos: %s)",
+                    "=> %s (toplevel: %s, block: %s, listitem: %s, float: %s, "
+                    "abspos: %s, fixpos: %s)",
                     result ? "true" : "false", toplevel ? "true" : "false",
-                    block ? "true" : "false", vloat ? "true" : "false",
-                    abspos ? "true" : "false", fixpos ? "true" : "false");
+                    block ? "true" : "false", listitem ? "true" : "false",
+                    vloat ? "true" : "false", abspos ? "true" : "false",
+                    fixpos ? "true" : "false");
       DBG_OBJ_LEAVE ();
       return result;
    }