Merge with main repo.

1 files changed, 6 insertions, 2 deletions

diff --git a/dw/textblock.cc b/dw/textblock.cc
index b31cbfbd..5e5bd264 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -557,8 +557,12 @@ void Textblock::sizeAllocateImpl (core::Allocation *allocation)
    for (lineIndex = 0; lineIndex < lines->size (); lineIndex++) {
       // Especially for floats, allocation->width may be different
       // from the line break width, so that for centered and right
-      // text, the offsets have to be recalculated again.
-      calcTextOffset (lineIndex, childBaseAllocation.width);
+      // text, the offsets have to be recalculated again. However, if
+      // the allocation width is greater than the line break width,
+      // due to wide unbreakable lines (large image etc.), use the
+      // original line break width.
+      calcTextOffset (lineIndex,
+                      misc::min (childBaseAllocation.width, lineBreakWidth));
 
       line = lines->getRef (lineIndex);
       xCursor = line->textOffset;