diff options
author | corvid, Johannes Hofmann <devnull@localhost> | 2010-04-04 00:10:43 +0000 |
---|---|---|
committer | corvid, Johannes Hofmann <devnull@localhost> | 2010-04-04 00:10:43 +0000 |
commit | 6d3fce97e3ae6dec3a0400332d8b0a00ca0bc08b (patch) | |
tree | 28f0b3193a97e7097d931c391dd67b397da690ec /dw/style.cc | |
parent | 6afddbd7a6a41c9a2c27a88749a3ed6dc082bbfd (diff) |
line-height
Diffstat (limited to 'dw/style.cc')
-rw-r--r-- | dw/style.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dw/style.cc b/dw/style.cc index 8d3035d0..65c51f89 100644 --- a/dw/style.cc +++ b/dw/style.cc @@ -45,9 +45,7 @@ void StyleAttrs::initValues () listStyleType = LIST_STYLE_TYPE_DISC; valign = VALIGN_BASELINE; backgroundColor = NULL; - width = LENGTH_AUTO; - height = LENGTH_AUTO; - + width = height = lineHeight = LENGTH_AUTO; margin.setVal (0); borderWidth.setVal (0); padding.setVal (0); @@ -119,6 +117,7 @@ bool StyleAttrs::equals (object::Object *other) { vBorderSpacing == otherAttrs->vBorderSpacing && width == otherAttrs->width && height == otherAttrs->height && + lineHeight == otherAttrs->lineHeight && margin.equals (&otherAttrs->margin) && borderWidth.equals (&otherAttrs->borderWidth) && padding.equals (&otherAttrs->padding) && @@ -152,6 +151,7 @@ int StyleAttrs::hashValue () { vBorderSpacing + width + height + + lineHeight + margin.hashValue () + borderWidth.hashValue () + padding.hashValue () + @@ -238,6 +238,7 @@ void Style::copyAttrs (StyleAttrs *attrs) vBorderSpacing = attrs->vBorderSpacing; width = attrs->width; height = attrs->height; + lineHeight = attrs->lineHeight; margin = attrs->margin; borderWidth = attrs->borderWidth; padding = attrs->padding; |