Some smaller changes in dw (backport from RTFL).

3 files changed, 41 insertions, 12 deletions

diff --git a/dw/style.cc b/dw/style.cc
index 53d2cbb7..54d9af4b 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -1204,18 +1204,26 @@ void drawBorder (View *view, Layout *layout, Rectangle *area,
  *
  * Otherwise, the caller should not try to increase the performance by
  * doing some tests before; this is all done in this method.
+ * 
+ * "bgColor" is passes implicitly. For non-inversed drawing,
+ * style->backgroundColor may simply used. However, when drawing is
+ * inversed, and style->backgroundColor is undefined (NULL), a
+ * background color defined higher in the hierarchy (which is not
+ * accessable here) must be used.
+ *
+ * (Background *images* are never drawn inverse.)
  */
 void drawBackground (View *view, Layout *layout, Rectangle *area,
                      int x, int y, int width, int height,
                      int xRef, int yRef, int widthRef, int heightRef,
-                     Style *style, bool inverse, bool atTop)
+                     Style *style, Color *bgColor, bool inverse, bool atTop)
 {
-   bool bgColor = style->backgroundColor != NULL &&
+   bool hasBgColor = bgColor != NULL &&
       // The test for background colors is rather simple, since only the color
       // has to be compared, ...
-      (!atTop || layout->getBgColor () != style->backgroundColor);
-   bool bgImage = (style->backgroundImage != NULL &&
-                   style->backgroundImage->getImgbufSrc() != NULL) &&
+      (!atTop || layout->getBgColor () != bgColor);
+   bool hasBgImage = (style->backgroundImage != NULL &&
+                      style->backgroundImage->getImgbufSrc() != NULL) &&
       // ... but for backgrounds, it would be rather complicated. To handle the
       // two cases (normal HTML in a viewport, where the layout background
       // image is set, and contents of <button> within a flat view, where the
@@ -1229,7 +1237,7 @@ void drawBackground (View *view, Layout *layout, Rectangle *area,
    // necessary to draw the background if background color and image
    // are not set (NULL), i. e. shining through.
 
-   if (bgColor || bgImage) {
+   if (hasBgColor || hasBgImage) {
       Rectangle bgArea, intersection;
       bgArea.x = x;
       bgArea.y = y;
@@ -1237,14 +1245,14 @@ void drawBackground (View *view, Layout *layout, Rectangle *area,
       bgArea.height = height;
 
       if (area->intersectsWith (&bgArea, &intersection)) {
-         if (bgColor)
-            view->drawRectangle (style->backgroundColor,
+         if (hasBgColor)
+            view->drawRectangle (bgColor,
                                  inverse ?
                                  Color::SHADING_INVERSE : Color::SHADING_NORMAL,
                                  true, intersection.x, intersection.y,
                                  intersection.width, intersection.height);
 
-         if (bgImage)
+         if (hasBgImage)
             drawBackgroundImage (view, style->backgroundImage,
                                  style->backgroundRepeat,
                                  style->backgroundAttachment,
diff --git a/dw/style.hh b/dw/style.hh
index 948a6457..230baa24 100644
--- a/dw/style.hh
+++ b/dw/style.hh
@@ -889,7 +889,7 @@ void drawBorder (View *view, Layout *layout, Rectangle *area,
 void drawBackground (View *view, Layout *layout, Rectangle *area,
                      int x, int y, int width, int height,
                      int xRef, int yRef, int widthRef, int heightRef,
-                     Style *style, bool inverse, bool atTop);
+                     Style *style, Color *bgColor, bool inverse, bool atTop);
 void drawBackgroundImage (View *view, StyleImage *backgroundImage,
                           BackgroundRepeat backgroundRepeat,
                           BackgroundAttachment backgroundAttachment,
diff --git a/dw/widget.cc b/dw/widget.cc
index ae8da192..1e7a05d1 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -1181,6 +1181,10 @@ void Widget::drawBox (View *view, style::Style *style, Rectangle *area,
    // does not define what here is called "reference area". To make it look
    // smoothly, the widget padding box is used.
 
+   // TODO Handle inverse drawing the same way as in drawWidgetBox?
+   // Maybe this method (drawBox) is anyway obsolete when extraSpace
+   // is fully supported (as in the "dillo_grows" repository).
+
    int xPad, yPad, widthPad, heightPad;
    getPaddingArea (&xPad, &yPad, &widthPad, &heightPad);
    style::drawBackground
@@ -1191,7 +1195,8 @@ void Widget::drawBox (View *view, style::Style *style, Rectangle *area,
        - style->margin.right - style->borderWidth.right,
        height - style->margin.top - style->borderWidth.top
        - style->margin.bottom - style->borderWidth.bottom,
-       xPad, yPad, widthPad, heightPad, style, inverse, false);
+       xPad, yPad, widthPad, heightPad, style, style->backgroundColor,
+       inverse, false);
 }
 
 /**
@@ -1213,10 +1218,26 @@ void Widget::drawWidgetBox (View *view, Rectangle *area, bool inverse)
 
    int xPad, yPad, widthPad, heightPad;
    getPaddingArea (&xPad, &yPad, &widthPad, &heightPad);
+
+   style::Color *bgColor;
+   if (inverse && style->backgroundColor == NULL) {
+      // See style::drawBackground: for inverse drawing, we need a
+      // defined background color. Search through ancestors.
+      Widget *w = this;
+      while (w != NULL && w->style->backgroundColor == NULL)
+         w = w->parent;
+      
+      if (w != NULL && w->style->backgroundColor != NULL)
+         bgColor = w->style->backgroundColor;
+      else
+         bgColor = layout->getBgColor ();
+   } else
+      bgColor = style->backgroundColor;
+
    style::drawBackground (view, layout, &canvasArea,
                           xPad, yPad, widthPad, heightPad,
                           xPad, yPad, widthPad, heightPad,
-                          style, inverse, parent == NULL);
+                          style, bgColor, inverse, parent == NULL);
 }
 
 /*