Merged with Aethyra master as of 2009-01-27

Conflicts:
	Almost everywhere.

1 files changed, 15 insertions, 6 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 8a74cd72..1d7f8472 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -23,6 +23,7 @@
 
 #include "scrollarea.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 
 #include "../resources/image.h"
@@ -94,6 +95,7 @@ void ScrollArea::init()
                         bggridx[x], bggridy[y],
                         bggridx[x + 1] - bggridx[x] + 1,
                         bggridy[y + 1] - bggridy[y] + 1);
+                background.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
@@ -106,12 +108,15 @@ void ScrollArea::init()
         int vsgridy[4] = {0, 4, 15, 19};
         a = 0;
 
-        for (y = 0; y < 3; y++) {
-            for (x = 0; x < 3; x++) {
+        for (y = 0; y < 3; y++) 
+        {
+            for (x = 0; x < 3; x++) 
+            {
                 vMarker.grid[a] = vscroll->getSubImage(
                         vsgridx[x], vsgridy[y],
                         vsgridx[x + 1] - vsgridx[x],
                         vsgridy[y + 1] - vsgridy[y]);
+                vMarker.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
@@ -197,7 +202,8 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
     int w = getWidth() + bs * 2;
     int h = getHeight() + bs * 2;
 
-    if (mOpaque) {
+    if (mOpaque) 
+    {
         static_cast<Graphics*>(graphics)->
             drawImageRect(0, 0, w, h, background);
     }
@@ -207,10 +213,12 @@ void ScrollArea::setOpaque(bool opaque)
 {
     mOpaque = opaque;
 
-    if (mOpaque) {
+    if (mOpaque) 
+    {
         setFrameSize(2);
     }
-    else {
+    else 
+    {
         setFrameSize(0);
     }
 }
@@ -220,7 +228,8 @@ void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir)
     int state = 0;
     gcn::Rectangle dim;
 
-    switch(dir) {
+    switch(dir) 
+    {
         case UP:
             state = mUpButtonPressed ? 1 : 0;
             dim = getUpButtonDimension();