Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 11 insertions, 2 deletions

diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index a0142663..b66592c1 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -22,6 +22,7 @@
 #include "emoteshortcutcontainer.h"
 
 #include "../animatedsprite.h"
+#include "../configuration.h"
 #include "../emoteshortcut.h"
 #include "../graphics.h"
 #include "../inventory.h"
@@ -42,11 +43,10 @@
 static const int MAX_ITEMS = 12;
 
 EmoteShortcutContainer::EmoteShortcutContainer():
+    ShortcutContainer(),
     mEmoteClicked(false),
     mEmoteMoved(0)
 {
-    mGridWidth = 1,
-    mGridHeight = 1,
     addMouseListener(this);
     addWidgetListener(this);
 
@@ -54,6 +54,8 @@ EmoteShortcutContainer::EmoteShortcutContainer():
 
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
 
+    mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
+
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
@@ -96,6 +98,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
         }
 
     }
+
     if (mEmoteMoved)
     {
         // Draw the emote image being dragged by the cursor.
@@ -108,6 +111,12 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
             sprite->draw(g, tPosX, tPosY);
         }
     }
+
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+    {
+        mAlpha = config.getValue("guialpha", 0.8);
+        mBackgroundImg->setAlpha(mAlpha);
+    }
 }
 
 void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)