Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 20 insertions, 8 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 3ee27064..eacc4714 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
-
 #include "scrollarea.h"
 
 #include "../configuration.h"
@@ -32,19 +30,22 @@
 #include "../utils/dtor.h"
 
 int ScrollArea::instances = 0;
+float ScrollArea::mAlpha = config.getValue("guialpha", 0.8);
 ImageRect ScrollArea::background;
 ImageRect ScrollArea::vMarker;
 Image *ScrollArea::buttons[4][2];
 
-ScrollArea::ScrollArea(bool gc):
+ScrollArea::ScrollArea(bool gc, bool opaque):
     gcn::ScrollArea(),
+    mOpaque(opaque),
     mGC(gc)
 {
     init();
 }
 
-ScrollArea::ScrollArea(gcn::Widget *widget, bool gc):
+ScrollArea::ScrollArea(gcn::Widget *widget, bool gc, bool opaque):
     gcn::ScrollArea(widget),
+    mOpaque(opaque),
     mGC(gc)
 {
     init();
@@ -53,9 +54,8 @@ ScrollArea::ScrollArea(gcn::Widget *widget, bool gc):
 ScrollArea::~ScrollArea()
 {
     // Garbage collection
-    if (mGC) {
+    if (mGC)
         delete getContent();
-    }
 
     instances--;
 
@@ -89,8 +89,10 @@ void ScrollArea::init()
         const int bggridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
 
-        for (y = 0; y < 3; y++) {
-            for (x = 0; x < 3; x++) {
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
                 background.grid[a] = textbox->getSubImage(
                         bggridx[x], bggridy[y],
                         bggridx[x + 1] - bggridx[x] + 1,
@@ -193,6 +195,16 @@ void ScrollArea::draw(gcn::Graphics *graphics)
                     mScrollbarWidth));
     }
 
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+    {
+        mAlpha = config.getValue("guialpha", 0.8);
+        for (int a = 0; a < 9; a++)
+        {
+            background.grid[a]->setAlpha(mAlpha);
+            vMarker.grid[a]->setAlpha(mAlpha);
+        }
+    }
+
     drawChildren(graphics);
 }