Summary: | text comes over images but goes correclty after resizing | ||
---|---|---|---|
Product: | [Applications] konqueror | Reporter: | Albert Astals Cid <aacid> |
Component: | khtml | Assignee: | Konqueror Developers <konq-bugs> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | unspecified | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Attachments: |
Before resizing text goes over the image
After resizing all is fine |
Description
Albert Astals Cid
2003-12-29 19:45:58 UTC
Created attachment 3876 [details]
Before resizing text goes over the image
Created attachment 3877 [details]
After resizing all is fine
same here (20031105) CVS commit by ggarand: as discussed on kfm-devel, - displace the check for new floats invalidating the layout of remaining children. It was outside of loop (#71445). - remove check for floatBottom() > m_y that seems outdated. CCMAIL: 71445-done@bugs.kde.org M +7 -0 ChangeLog 1.223 M +5 -6 rendering/render_block.cpp 1.32 --- kdelibs/khtml/ChangeLog #1.222:1.223 @@ -1,2 +1,9 @@ +2004-02-28 Germain Garand <germain@ebooksfrance.org> + + * rendering/render_block.cpp (layoutBlockChildren): + - displace the check for if we need to relayout our childs + because of a float. It was outside of loop (#71445) + - remove check for floatBottom() > m_y has it seems outdated. + 2004-02-25 Dirk Mueller <mueller@kde.org> --- kdelibs/khtml/rendering/render_block.cpp #1.31:1.32 @@ -638,8 +638,4 @@ void RenderBlock::layoutBlockChildren( b //kdDebug() << "RenderBlock::layoutBlockChildren " << prevMargin << endl; - // take care in case we inherited floats - if (child && floatBottom() > m_height) - child->setLayouted( false ); - // QTime t; // t.start(); @@ -660,6 +656,5 @@ void RenderBlock::layoutBlockChildren( b // make sure we relayout children if we need it. - if ( relayoutChildren || floatBottom() > m_y || - (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent()))) + if ( relayoutChildren || (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent()))) child->setLayouted( false ); @@ -800,4 +795,8 @@ void RenderBlock::layoutBlockChildren( b } + // take care in case we inherited floats + if (floatBottom() > m_height) + child->setLayouted(false); + child->calcVerticalMargins(); |