Commit de8798e2 authored by hyatt's avatar hyatt
Browse files

Fix for 3032869, the background image for the body was being

	propagated up to the root properly but was not being tiled over
	the whole canvas.

        * khtml/rendering/render_box.cpp:
        (RenderBox::printBackground):
        * khtml/rendering/render_html.cpp:
        (RenderHtml::printBoxDecorations):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b613789e
2002-11-12 David Hyatt <hyatt@apple.com>
Fix for 3032869, the background image for the body was being
propagated up to the root properly but was not being tiled over
the whole canvas.
* khtml/rendering/render_box.cpp:
(RenderBox::printBackground):
* khtml/rendering/render_html.cpp:
(RenderHtml::printBoxDecorations):
2002-11-12 David Hyatt <hyatt@apple.com>
 
Fix the top of moveabletype.org. The maxwidth/minwidth
......
2002-11-12 David Hyatt <hyatt@apple.com>
Fix for 3032869, the background image for the body was being
propagated up to the root properly but was not being tiled over
the whole canvas.
* khtml/rendering/render_box.cpp:
(RenderBox::printBackground):
* khtml/rendering/render_html.cpp:
(RenderHtml::printBoxDecorations):
2002-11-12 David Hyatt <hyatt@apple.com>
 
Fix the top of moveabletype.org. The maxwidth/minwidth
......
2002-11-12 David Hyatt <hyatt@apple.com>
Fix for 3032869, the background image for the body was being
propagated up to the root properly but was not being tiled over
the whole canvas.
* khtml/rendering/render_box.cpp:
(RenderBox::printBackground):
* khtml/rendering/render_html.cpp:
(RenderHtml::printBoxDecorations):
2002-11-12 David Hyatt <hyatt@apple.com>
 
Fix the top of moveabletype.org. The maxwidth/minwidth
......
......@@ -217,7 +217,7 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
{
//scroll
int pw = m_width - vpab;
int h = m_height;
int h = isHtml() ? h : m_height;
if (isTableCell()) {
// Table cells' m_height variable is wrong. You have to take into
// account this hack extra stuff to get the right height.
......
......@@ -77,18 +77,19 @@ void RenderHtml::printBoxDecorations(QPainter *p,int, int _y,
// kdDebug(0) << "width = " << w <<endl;
int rw;
int rw, rh;
if (root()->view())
rw=root()->view()->contentsWidth();
else
rw=root()->width();
rh=root()->height();
// kdDebug(0) << "rw = " << rw <<endl;
int bx = _tx - marginLeft();
int by = _ty - marginTop();
int bw = QMAX(w + marginLeft() + marginRight() + borderLeft() + borderRight(), rw);
int bh = QMAX(h + marginTop() + marginBottom() + borderTop() + borderBottom(), parent()->height());
int bh = QMAX(h + marginTop() + marginBottom() + borderTop() + borderBottom(), rh);
// CSS2 14.2:
// " The background of the box generated by the root element covers the entire canvas."
......
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