Apply Guichan's changes from 063dc975e98dfc74c2565229ce175cccc70fa4dd…

… (Apr 12th 2008)

ScrollArea::isOpaque and ScrollArea::setOpaque have been added to control if a scroll area should draw its background or not.

ChangeLog

@@ -1,5 +1,7 @@
 Version 1.1.0
 =============
+* ScrollArea::isOpaque and ScrollArea::setOpaque have been added to
+  control if a scroll area should draw its background or not.
 * Widget::showPart has been added to be used when a specific
   part of a widget should be visible. An example is when a text
   area wants a specific text part to be visible in a scroll area.

TODO

@@ -1,4 +1,4 @@
-* Continue rebasing from 063dc975e98dfc74c2565229ce175cccc70fa4dd
+* Continue rebasing from ba5109fdd43281372247cf4259c5cf19376271ce
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

include/guisan/widgets/container.hpp

@@ -107,7 +107,7 @@ namespace gcn
         /**
          * Checks if the container is opaque or not.
          *
-         * @return true if the container is opaque, false otherwise.
+         * @return True if the container is opaque, false otherwise.
          * @see setOpaque
          */
         bool isOpaque() const;

include/guisan/widgets/scrollarea.hpp

@@ -292,6 +292,21 @@ namespace gcn
          */
         int getDownButtonScrollAmount() const;
 
+        /**
+         * Sets the scroll area to be opaque, that is sets the scoll area
+         * to display its background.
+         *
+         * @param opaque True if the scoll area should be opaque, false otherwise.
+         */
+        void setOpaque(bool opaque);
+
+        /**
+         * Checks if the scroll area is opaque, that is if the scroll area
+         * displays its background.
+         *
+         * @return True if the scroll area is opaque, false otherwise.
+         */
+        bool isOpaque() const;
 
         // Inherited from BasicContainer
 
@@ -548,6 +563,13 @@ namespace gcn
          * Holds the vertical markers drag offset.
          */
         int mVerticalMarkerDragOffset;
+
+        /**
+         * True if the scroll area should be opaque
+         * (that is display its background),
+         * false otherwise.
+         */
+        bool mOpaque;
     };
 }
 

src/widgets/scrollarea.cpp

@@ -82,6 +82,7 @@ namespace gcn
         mRightButtonScrollAmount = 10;
         mIsVerticalMarkerDragged = false;
         mIsHorizontalMarkerDragged =false;
+        mOpaque = true;
 
         addMouseListener(this);
     }
@@ -103,6 +104,7 @@ namespace gcn
         mRightButtonScrollAmount = 10;
         mIsVerticalMarkerDragged = false;
         mIsHorizontalMarkerDragged =false;
+        mOpaque = true;
 
         setContent(content);
         addMouseListener(this);
@@ -125,6 +127,7 @@ namespace gcn
         mRightButtonScrollAmount = 10;
         mIsVerticalMarkerDragged = false;
         mIsHorizontalMarkerDragged =false;
+        mOpaque = true;
 
         setContent(content);
         addMouseListener(this);
@@ -498,8 +501,11 @@ namespace gcn
 
     void ScrollArea::drawBackground(Graphics *graphics)
     {
-        graphics->setColor(getBackgroundColor());
-        graphics->fillRectangle(getChildrenArea());
+        if (isOpaque())
+        {
+            graphics->setColor(getBackgroundColor());
+            graphics->fillRectangle(getChildrenArea());
+        }
     }
 
     void ScrollArea::drawUpButton(Graphics* graphics)
@@ -1241,6 +1247,16 @@ namespace gcn
     {
         return mDownButtonScrollAmount;
     }
+
+    void ScrollArea::setOpaque(bool opaque)
+    {
+        mOpaque = opaque;
+    }
+
+    bool ScrollArea::isOpaque() const
+    {
+        return mOpaque;
+    }
 }
 
 /*