call layout->setBgColor() from web.cc

6 files changed, 12 insertions, 10 deletions

diff --git a/dw/layout.cc b/dw/layout.cc
index f3ff896e..aa9f05ed 100644
--- a/dw/layout.cc
+++ b/dw/layout.cc
@@ -611,7 +611,8 @@ void Layout::updateCursor ()
 void Layout::setBgColor (style::Color *color)
 {
    bgColor = color;
-   view->setBgColor (bgColor);
+   if (view)
+      view->setBgColor (bgColor);
 }
 
 void Layout::resizeIdle ()
diff --git a/src/css.cc b/src/css.cc
index 2e3b4858..25ddc9ae 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -566,7 +566,6 @@ void CssContext::buildUserAgentStyle () {
      ":link {color: blue; text-decoration: underline; cursor: pointer}"
      ":visited {color: #800080; text-decoration: underline; cursor: pointer}"
      "h1, h2, h3, h4, h5, h6, b, strong {font-weight: bolder}"
-     "html  {font-family: sans-serif; color: black}"
      "i, em, cite, address, var {font-style: italic}"
      ":link img, :visited img {border: 1px solid}"
      "frameset, ul, ol, dir {margin-left: 40px}"
diff --git a/src/html.cc b/src/html.cc
index 91b8ac99..1a353224 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1785,10 +1785,9 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
     */
    if (!bgColor)
       bgColor = html->styleEngine->style ()->backgroundColor;
-   if (!bgColor)
-      bgColor = style::Color::create (HT2LT(html), prefs.bg_color);
 
-   HT2LT(html)->setBgColor(bgColor);  
+   if (bgColor)
+      HT2LT(html)->setBgColor(bgColor);  
 
    /* Determine a color for visited links.
     * This color is computed once per page and used for immediate feedback
diff --git a/src/plain.cc b/src/plain.cc
index b5b2dc0a..4da618e4 100644
--- a/src/plain.cc
+++ b/src/plain.cc
@@ -85,8 +85,6 @@ void a_Plain_free(void *data);
  */
 DilloPlain::DilloPlain(BrowserWindow *p_bw)
 {
-   style::Color *bgColor;
-
    /* Init event receiver */
    plainReceiver.plain = this;
 
@@ -97,8 +95,6 @@ DilloPlain::DilloPlain(BrowserWindow *p_bw)
    state = ST_SeekingEol;
 
    Layout *layout = (Layout*) bw->render_layout;
-   bgColor = style::Color::create (layout, prefs.bg_color);
-   layout->setBgColor(bgColor);
    StyleEngine styleEngine (layout);
 
    styleEngine.startElement ("body");
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 93836735..001165d6 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -449,6 +449,8 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh,
    // Now create the Dw render layout and viewport
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
+   style::Color *bgColor = style::Color::create (layout, prefs.bg_color);
+   layout->setBgColor (bgColor);
 
    FltkViewport *viewport = new FltkViewport (0, 0, 1, 1);
    if (prefs.buffered_drawing == 1)
@@ -507,6 +509,8 @@ static BrowserWindow *UIcmd_tab_new(const void *vbw)
    // Now create the Dw render layout and viewport
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
+   style::Color *bgColor = style::Color::create (layout, prefs.bg_color);
+   layout->setBgColor (bgColor);
 
    FltkViewport *viewport = new FltkViewport (0, 0, 1, 1);
 
diff --git a/src/web.cc b/src/web.cc
index 17302b1c..1b5741ae 100644
--- a/src/web.cc
+++ b/src/web.cc
@@ -61,10 +61,13 @@ int a_Web_dispatch_by_type (const char *Type, DilloWeb *Web,
    if (Web->flags & WEB_RootUrl) {
       /* We have RootUrl! */
 
+      style::Color *bgColor = style::Color::create (layout, prefs.bg_color);
+      Web->bgColor = bgColor->getColor ();
+      layout->setBgColor (bgColor);
+
       /* Set a style for the widget */
       StyleEngine styleEngine (layout);
       styleEngine.startElement ("body");
-      Web->bgColor= styleEngine.backgroundStyle()->backgroundColor->getColor();
 
       dw = (Widget*) a_Mime_set_viewer(Type, Web, Call, Data);
       if (dw == NULL)