aboutsummaryrefslogtreecommitdiff
path: root/src/html.cc
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2010-10-11 23:36:36 +0200
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2010-10-11 23:36:36 +0200
commitff717a2d9bc7dad370e3eb9a7919ea8a12e46416 (patch)
tree322a714a070feb749ab948efe989accd5ed8244a /src/html.cc
parent97cd61e9ca455834cc2095241bf0f3517208b83d (diff)
use background-color on <html>-element
Diffstat (limited to 'src/html.cc')
-rw-r--r--src/html.cc25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/html.cc b/src/html.cc
index 9b53a082..e7ca7990 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1715,8 +1715,6 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
Textblock *textblock;
int32_t color;
int tag_index_a = a_Html_tag_index ("a");
- int tag_index_body = a_Html_tag_index ("body");
- int tag_index_html = a_Html_tag_index ("html");
style::Color *bgColor;
if (!(html->InFlags & IN_BODY))
@@ -1732,22 +1730,6 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
BUG_MSG("unclosed HEAD element\n");
}
- html->styleEngine->endElement(tag_index_body);
- html->styleEngine->endElement(tag_index_html);
- html->styleEngine->startElement(tag_index_html);
- bgColor = html->styleEngine->style ()->backgroundColor;
- html->styleEngine->startElement(tag_index_body);
-
- if ((attrbuf = Html_get_attr2(html, tag, tagsize, "id",
- HTML_LeftTrim | HTML_RightTrim)))
- html->styleEngine->setId(attrbuf);
- if ((attrbuf = Html_get_attr2(html, tag, tagsize, "class",
- HTML_LeftTrim | HTML_RightTrim)))
- html->styleEngine->setClass(attrbuf);
- if ((attrbuf = Html_get_attr2(html, tag, tagsize, "style",
- HTML_LeftTrim | HTML_RightTrim)))
- html->styleEngine->setStyle(attrbuf);
-
textblock = HT2TB(html);
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "bgcolor"))) {
@@ -1764,6 +1746,8 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
CSS_TYPE_COLOR, color);
}
+ html->styleEngine->restyle ();
+
if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "link")))
html->non_css_link_color = a_Html_color_parse(html, attrbuf, -1);
@@ -1772,10 +1756,7 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
html->dw->setStyle (html->styleEngine->style ());
- /* Set canvas color if not already set from Html_open_html().
- */
- if (!bgColor)
- bgColor = html->styleEngine->style ()->backgroundColor;
+ bgColor = html->styleEngine->backgroundColor ();
if (bgColor)
HT2LT(html)->setBgColor(bgColor);