[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.1/kdelibs/khtml/css
From: Harri Porten <porten () kde ! org>
Date: 2008-10-19 16:16:42
Message-ID: 1224433002.081992.19386.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 873514 by porten:
Merged revision 873511:
Fixed margin values on invisible elements. Also fixed computed value of percentage \
value.
M +12 -8 css_renderstyledeclarationimpl.cpp
--- branches/KDE/4.1/kdelibs/khtml/css/css_renderstyledeclarationimpl.cpp \
#873513:873514 @@ -757,17 +757,21 @@
case CSS_PROP_LIST_STYLE_TYPE:
return new CSSPrimitiveValueImpl(stringForListStyleType(style->listStyleType()), \
CSSPrimitiveValue::CSS_STRING); case CSS_PROP_MARGIN_TOP:
- RETURN_NULL_ON_NULL(renderer);
- return valueForLength(style->marginTop(), renderer->contentHeight());
+ if (renderer)
+ return new CSSPrimitiveValueImpl(renderer->marginTop(), \
CSSPrimitiveValue::CSS_PX); + return valueForLength2(style->marginTop());
case CSS_PROP_MARGIN_RIGHT:
- RETURN_NULL_ON_NULL(renderer);
- return valueForLength(style->marginRight(), renderer->contentWidth());
+ if (renderer)
+ return new CSSPrimitiveValueImpl(renderer->marginRight(), \
CSSPrimitiveValue::CSS_PX); + return valueForLength2(style->marginRight());
case CSS_PROP_MARGIN_BOTTOM:
- RETURN_NULL_ON_NULL(renderer);
- return valueForLength(style->marginBottom(), renderer->contentHeight());
+ if (renderer)
+ return new CSSPrimitiveValueImpl(renderer->marginBottom(), \
CSSPrimitiveValue::CSS_PX); + return valueForLength2(style->marginBottom());
case CSS_PROP_MARGIN_LEFT:
- RETURN_NULL_ON_NULL(renderer);
- return valueForLength(style->marginLeft(), renderer->contentWidth());
+ if (renderer)
+ return new CSSPrimitiveValueImpl(renderer->marginLeft(), \
CSSPrimitiveValue::CSS_PX); + return valueForLength2(style->marginLeft());
case CSS_PROP__KHTML_MARQUEE:
// FIXME: unimplemented
break;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic