diff options
author | Jorge Arellano Cid <jcid@dillo.org> | 2009-02-09 14:56:31 -0300 |
---|---|---|
committer | Jorge Arellano Cid <jcid@dillo.org> | 2009-02-09 14:56:31 -0300 |
commit | e32686c10a4f4fe7c34b181845220b5c491f32fb (patch) | |
tree | c090052c311a3a1732d03dc17fe357f97437b397 /src/styleengine.cc | |
parent | 74f64426001a693759e47963f99965e0e6ee847d (diff) |
whitespace cleanup: 's/ +$//g'
Diffstat (limited to 'src/styleengine.cc')
-rw-r--r-- | src/styleengine.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/styleengine.cc b/src/styleengine.cc index a4d5003a..c7d8a39e 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -34,7 +34,7 @@ StyleEngine::StyleEngine (dw::core::Layout *layout) { font_attrs.size = (int) (14 * prefs.font_factor + 0.5); font_attrs.weight = 400; font_attrs.style = FONT_STYLE_NORMAL; - + style_attrs.initValues (); style_attrs.font = Font::create (layout, &font_attrs); style_attrs.color = Color::create (layout, 0); @@ -146,11 +146,11 @@ void StyleEngine::endElement (int element) { if (n->wordStyle) n->wordStyle->unref (); if (n->id) - dFree ((void*) n->id); + dFree ((void*) n->id); if (n->klass) - dFree ((void*) n->klass); + dFree ((void*) n->klass); if (n->styleAttribute) - dFree ((void*) n->styleAttribute); + dFree ((void*) n->styleAttribute); stack->setSize (stack->size () - 1); } @@ -167,19 +167,19 @@ void StyleEngine::apply (StyleAttrs *attrs, CssPropertyList *props) { */ for (int i = 0; i < props->size (); i++) { CssProperty *p = props->getRef (i); - + switch (p->name) { case CSS_PROPERTY_FONT_FAMILY: // \todo handle comma separated lists of font names if (strcmp (p->value.strVal, "serif") == 0) fontAttrs.name = prefs.font_serif; - else if (strcmp (p->value.strVal, "sans-serif") == 0) + else if (strcmp (p->value.strVal, "sans-serif") == 0) fontAttrs.name = prefs.font_sans_serif; - else if (strcmp (p->value.strVal, "cursive") == 0) + else if (strcmp (p->value.strVal, "cursive") == 0) fontAttrs.name = prefs.font_cursive; - else if (strcmp (p->value.strVal, "fantasy") == 0) + else if (strcmp (p->value.strVal, "fantasy") == 0) fontAttrs.name = prefs.font_fantasy; - else if (strcmp (p->value.strVal, "monospace") == 0) + else if (strcmp (p->value.strVal, "monospace") == 0) fontAttrs.name = prefs.font_monospace; else fontAttrs.name = p->value.strVal; @@ -268,29 +268,29 @@ void StyleEngine::apply (StyleAttrs *attrs, CssPropertyList *props) { for (int i = 0; i < props->size (); i++) { CssProperty *p = props->getRef (i); - + switch (p->name) { /* \todo missing cases */ case CSS_PROPERTY_BACKGROUND_COLOR: attrs->backgroundColor = Color::create (layout, p->value.intVal); - break; + break; case CSS_PROPERTY_BORDER_TOP_COLOR: attrs->borderColor.top = Color::create (layout, p->value.intVal); - break; + break; case CSS_PROPERTY_BORDER_BOTTOM_COLOR: attrs->borderColor.bottom = Color::create (layout, p->value.intVal); - break; + break; case CSS_PROPERTY_BORDER_LEFT_COLOR: attrs->borderColor.left = Color::create (layout, p->value.intVal); - break; + break; case CSS_PROPERTY_BORDER_RIGHT_COLOR: attrs->borderColor.right = Color::create (layout, p->value.intVal); - break; + break; case CSS_PROPERTY_BORDER_BOTTOM_STYLE: attrs->borderStyle.bottom = (BorderStyle) p->value.intVal; break; @@ -321,10 +321,10 @@ void StyleEngine::apply (StyleAttrs *attrs, CssPropertyList *props) { break; case CSS_PROPERTY_COLOR: attrs->color = Color::create (layout, p->value.intVal); - break; + break; case CSS_PROPERTY_CURSOR: attrs->cursor = (Cursor) p->value.intVal; - break; + break; case CSS_PROPERTY_LIST_STYLE_TYPE: attrs->listStyleType = (ListStyleType) p->value.intVal; break; @@ -383,15 +383,15 @@ void StyleEngine::apply (StyleAttrs *attrs, CssPropertyList *props) { } /* make sure border colors are set */ - if (attrs->borderColor.top == NULL) + if (attrs->borderColor.top == NULL) attrs->borderColor.top = attrs->color; - if (attrs->borderColor.bottom == NULL) + if (attrs->borderColor.bottom == NULL) attrs->borderColor.bottom = attrs->color; - if (attrs->borderColor.left == NULL) + if (attrs->borderColor.left == NULL) attrs->borderColor.left = attrs->color; - if (attrs->borderColor.right == NULL) + if (attrs->borderColor.right == NULL) attrs->borderColor.right = attrs->color; - + } /** @@ -487,7 +487,7 @@ Style * StyleEngine::style0 (CssPropertyList *nonCssProperties) { if (styleAttributeProps) delete styleAttributeProps; - + return stack->getRef (stack->size () - 1)->style; } |