Commit f9030452 authored by hyatt's avatar hyatt

Code needs to go in calcMinMaxWidth instead, so parents computing

	their own minmax widths will get the correct value during the ifrst
	pass.  With this change weather.com is actually fixed.

        Reviewed by mjs

        * khtml/rendering/render_box.cpp:
        (RenderBox::calcWidth):
        * khtml/rendering/render_flow.cpp:
        (RenderFlow::calcMinMaxWidth):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d8d042fb
2002-12-16 David Hyatt <hyatt@apple.com>
Code needs to go in calcMinMaxWidth instead, so parents computing
their own minmax widths will get the correct value during the ifrst
pass. With this change weather.com is actually fixed.
Reviewed by mjs
* khtml/rendering/render_box.cpp:
(RenderBox::calcWidth):
* khtml/rendering/render_flow.cpp:
(RenderFlow::calcMinMaxWidth):
2002-12-16 David Hyatt <hyatt@apple.com>
Fix for 3128843, horked layout on weather.com. Ensure that
......
2002-12-16 David Hyatt <hyatt@apple.com>
Code needs to go in calcMinMaxWidth instead, so parents computing
their own minmax widths will get the correct value during the ifrst
pass. With this change weather.com is actually fixed.
Reviewed by mjs
* khtml/rendering/render_box.cpp:
(RenderBox::calcWidth):
* khtml/rendering/render_flow.cpp:
(RenderFlow::calcMinMaxWidth):
2002-12-16 David Hyatt <hyatt@apple.com>
Fix for 3128843, horked layout on weather.com. Ensure that
......
......@@ -572,12 +572,6 @@ void RenderBox::calcWidth()
}
}
// Scrolling marquees like to use this trick:
// <div style="overflow:hidden; width:300px"><nobr>.....[lots of text].....</nobr></div>
// We need to sanity-check our m_minWidth, and not let it exceed our clipped boundary. -dwh
if (style()->overflow() == OHIDDEN && m_minWidth > m_width)
m_minWidth = m_width;
#ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << "RenderBox::calcWidth(): m_width=" << m_width << " containingBlockWidth()=" << containingBlockWidth() << endl;
kdDebug( 6040 ) << "m_marginLeft=" << m_marginLeft << " m_marginRight=" << m_marginRight << endl;
......
......@@ -1703,6 +1703,12 @@ void RenderFlow::calcMinMaxWidth()
m_minWidth += toAdd;
m_maxWidth += toAdd;
// Scrolling marquees like to use this trick:
// <td><div style="overflow:hidden; width:300px"><nobr>.....[lots of text].....</nobr></div></td>
// We need to sanity-check our m_minWidth, and not let it exceed our clipped boundary. -dwh
if (style()->overflow() == OHIDDEN && m_minWidth > m_width)
m_minWidth = m_width;
setMinMaxKnown();
//kdDebug( 6040 ) << "Text::calcMinMaxWidth(" << this << "): min = " << m_minWidth << " max = " << m_maxWidth << endl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment