102536 2005-03-26 15:41:46 +0000 [test case] Incorrect margin for tables 2006-10-14 16:32:08 +0000 1 1 2 Applications konqueror khtml renderer unspecified unspecified Linux RESOLVED FIXED NOR normal --- 1 fleona konqueror-bugs-null 20 oldest_to_newest 328435 0 fleona 2005-03-26 15:41:47 +0000 Version: (using KDE KDE 3.4.0) Installed from: Unlisted Binary Package Compiler: gcc 3.4.3 OS: Linux Hey guys. I have a small site that shows the static pages of a project of mine. http://mipagina.cantv.net/fleona/html Mozilla and Safari render all those tables centered correctly, respecting the margins i set with CSS. Somehow, konqueror displays the tables left-aligned, as if it wasn't respecting the right margin Here is some css code of a table: ttp://mipagina.cantv.net/fleona/html/css/style.css table#header { background: #345487; width:90%; text-align: center; border-collapse: collapse; margin-left:5%; margin-right:5%; } margin-left and margin-right are 5%, set to center the table. On konqueror the right margin seems to be triple (15%). I don't think i will need to provide a screenshot, but if somehow you can't reproduce this, tell me to attach a comparison between mozilla and konqueror. Like i said, safari also renders correctly. 333737 1 lex.lists 2005-04-12 10:17:05 +0000 The alignment looks correct to me and the same as firefox. The right margin is too big though. 333755 2 10589 kde 2005-04-12 10:55:26 +0000 Created attachment 10589 test case A simple test case. It appears it doesn't happen if you replace the table with a div. 333756 3 10590 kde 2005-04-12 10:56:54 +0000 Created attachment 10590 Corrected test case Sorry, the first test case was buggy 476817 4 kde 2006-10-14 16:32:07 +0000 SVN commit 595493 by carewolf: Don't subtract margin from available-width + fix various width bugs that revealed themselves up after fixing that. BUG: 102536 M +15 -9 render_table.cpp M +4 -0 render_table.h M +6 -2 table_layout.cpp --- branches/KDE/3.5/kdelibs/khtml/rendering/render_table.cpp #595492:595493 @@ -233,27 +233,33 @@ RenderBlock *cb = containingBlock(); int availableWidth = cb->contentWidth(); - // Subtract minimum margins - availableWidth -= style()->marginLeft().minWidth(cb->contentWidth()); - availableWidth -= style()->marginRight().minWidth(cb->contentWidth()); - LengthType widthType = style()->width().type(); if(widthType > Relative && style()->width().value() > 0) { // Percent or fixed table - m_width = style()->width().minWidth( availableWidth ); + m_width = calcBoxWidth(style()->width().minWidth( availableWidth )); if(m_minWidth > m_width) m_width = m_minWidth; } else { - m_width = KMIN(short( availableWidth ), short(m_maxWidth)); + // Subtract out any fixed margins from our available width for auto width tables. + int marginTotal = 0; + if (!style()->marginLeft().isVariable()) + marginTotal += style()->marginLeft().width(availableWidth); + if (!style()->marginRight().isVariable()) + marginTotal += style()->marginRight().width(availableWidth); + + // Subtract out our margins to get the available content width. + int availContentWidth = kMax(0, availableWidth - marginTotal); + + // Ensure we aren't bigger than our max width or smaller than our min width. + m_width = kMin(availContentWidth, m_maxWidth); } // restrict width to what we really have // EXCEPT percent tables, which are still calculated as above - availableWidth = cb->lineWidth( m_y ); if ( widthType != Percent ) - m_width = KMIN( short( availableWidth ), m_width ); + m_width = kMin( short( availableWidth ), m_width ); - m_width = KMAX (m_width, m_minWidth); + m_width = kMax (m_width, m_minWidth); // Finally, with our true width determined, compute our margins for real. m_marginRight=0; --- branches/KDE/3.5/kdelibs/khtml/rendering/render_table.h #595492:595493 @@ -73,6 +73,10 @@ int borderRight() const; int borderTop() const; int borderBottom() const; + int paddingLeft() const { return collapseBorders() ? 0 : RenderBlock::paddingLeft(); } + int paddingRight() const { return collapseBorders() ? 0 : RenderBlock::paddingRight(); } + int paddingTop() const { return collapseBorders() ? 0 : RenderBlock::paddingTop(); } + int paddingBottom() const { return collapseBorders() ? 0 : RenderBlock::paddingBottom(); } const QColor &bgColor() const { return style()->backgroundColor(); } --- branches/KDE/3.5/kdelibs/khtml/rendering/table_layout.cpp #595492:595493 @@ -233,7 +233,10 @@ // unlimited. int bs = table->bordersPaddingAndSpacing(); - int tableWidth = table->style()->width().isFixed() ? table->style()->width().value() - bs : 0; + int tableWidth = 0; + if (table->style()->width().isFixed()) { + tableWidth = table->calcBoxWidth(table->style()->width().value()); + } int mw = calcWidthArray() + bs; table->m_minWidth = kMin( kMax( mw, tableWidth ), 0x7fff ); @@ -599,7 +602,8 @@ Length tw = table->style()->width(); if ( tw.isFixed() && tw.value() > 0 ) { - minWidth = kMax( minWidth, int( tw.value() ) ); + int width = table->calcBoxWidth(tw.value()); + minWidth = kMax( minWidth, width ); maxWidth = minWidth; } 10589 2005-04-12 10:55:26 +0000 2005-04-12 10:56:54 +0000 test case 102536.html text/html 297 kde PGh0bWw+CjxoZWFkPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgpkaXYgewoJYmFja2dyb3VuZDog IzM0NTQ4NzsKCXdpZHRoOjkwJTsKCWhlaWdodDogMTAwcHg7Cgl0ZXh0LWFsaWduOiBjZW50ZXI7 Cglib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOwoJbWFyZ2luLWxlZnQ6NSU7CgltYXJnaW4tcmln aHQ6NSU7Cn0KPC9zdHlsZT4KPC9oZWFkPgo8Ym9keT4KPHRhYmxlID4KICA8dGJvZHk+CiAgIDx0 cj4KICAgIDx0ZCA+CiAgICA8L3RkPgogICA8L3RyPgogIDwvdGJvZHk+CjwvdGFibGU+CgoKPC9i b2R5Pgo8L2h0bWw+ 10590 2005-04-12 10:56:54 +0000 2005-04-12 10:56:54 +0000 Corrected test case 102536.html text/html 299 kde PGh0bWw+CjxoZWFkPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgp0YWJsZSB7CgliYWNrZ3JvdW5k OiAjMzQ1NDg3OwoJd2lkdGg6OTAlOwoJaGVpZ2h0OiAxMDBweDsKCXRleHQtYWxpZ246IGNlbnRl cjsKCWJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7CgltYXJnaW4tbGVmdDo1JTsKCW1hcmdpbi1y aWdodDo1JTsKfQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8dGFibGUgPgogIDx0Ym9keT4KICAg PHRyPgogICAgPHRkID4KICAgIDwvdGQ+CiAgIDwvdHI+CiAgPC90Ym9keT4KPC90YWJsZT4KCgo8 L2JvZHk+CjwvaHRtbD4=