diff options
| -rw-r--r-- | WebCore/rendering/bidi.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp index 24c2051..dc5176e 100644 --- a/WebCore/rendering/bidi.cpp +++ b/WebCore/rendering/bidi.cpp @@ -953,7 +953,16 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i if (!isConstrained) { int screenWidth = view()->frameView()->screenWidth(); if (screenWidth > 0 && width() > screenWidth) { - int maxWidth = screenWidth - 2 * ANDROID_FCTS_MARGIN_PADDING; + // if the current padding is smaller, add an extra to make + // it 2 * ANDROID_FCTS_MARGIN_PADDING so that the text won't + // overlap with the screen edge. If the current padding is + // negative, leave it alone. + int padding = paddingLeft() + paddingRight(); + if (padding < 0 || padding >= 2 * ANDROID_FCTS_MARGIN_PADDING) + padding = 0; + else + padding = 2 * ANDROID_FCTS_MARGIN_PADDING - padding; + int maxWidth = screenWidth - padding; setWidth(min(width(), maxWidth)); m_minPrefWidth = min(m_minPrefWidth, maxWidth); m_maxPrefWidth = min(m_maxPrefWidth, maxWidth); |