Made a few more window components use a transparency under OpenGL, as

well as some code style cleanups in the skill dialog.

Signed-off-by: Ira Rice <irarice@gmail.com>

6 files changed, 18 insertions, 10 deletions

diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index f0ab8274..b576e843 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -21,6 +21,7 @@
 
 #include "itemshortcutcontainer.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
@@ -47,6 +48,8 @@ ItemShortcutContainer::ItemShortcutContainer():
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
     mMaxItems = itemShortcut->getItemCount();
 
+    mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
+
     mBoxHeight = 42;
     mBoxWidth = 36;
 }
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 79c5676f..e5227e5a 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -23,6 +23,7 @@
 
 #include "playerbox.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../player.h"
 
@@ -54,6 +55,7 @@ PlayerBox::PlayerBox(const Player *player):
                         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++;
             }
         }
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 032e3f78..ba119a61 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++;
             }
         }
@@ -112,6 +114,7 @@ void ScrollArea::init()
                         vsgridx[x], vsgridy[y],
                         vsgridx[x + 1] - vsgridx[x],
                         vsgridy[y + 1] - vsgridy[y]);
+                vMarker.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 5e5782d9..2ff82030 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -58,11 +58,9 @@ public:
         update();
     }
 
-    virtual int
-    getRows(void) { return mEntriesNr; }
+    virtual int getRows(void) { return mEntriesNr; }
 
-    virtual int
-    getColumnWidth(int index)
+    virtual int getColumnWidth(int index)
     {
         switch (index) {
         case 0:  return 160;
@@ -70,14 +68,12 @@ public:
         }
     }
 
-    virtual int
-    getRowHeight(void)
+    virtual int getRowHeight(void)
     {
         return 12;
     }
 
-    virtual void
-    update(void)
+    virtual void update(void)
     {
 	static const SkillInfo fakeSkillInfo = { _("???"), false };
 
@@ -249,8 +245,7 @@ void SkillDialog::cleanList()
     mSkillList.clear();
 }
 
-static void
-initSkillinfo(void)
+static void initSkillinfo(void)
 {
     SkillInfo emptySkillInfo = { "", false };
 
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
index afe4ce15..d221f55c 100644
--- a/src/gui/smileycontainer.cpp
+++ b/src/gui/smileycontainer.cpp
@@ -24,6 +24,7 @@
 #include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
 
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../log.h"
 #include "../smileyshortcut.h"
@@ -51,6 +52,8 @@ SmileyContainer::SmileyContainer():
     mSelImg = resman->getImage("graphics/gui/selection.png");
     if (!mSelImg) logger->error(_("Unable to load selection.png"));
 
+    mSelImg->setAlpha(config.getValue("guialpha", 0.8));
+
     mMaxSmiley = mSmileyImg->size(); 
 
     addMouseListener(this);
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index d4709d3f..0146fd4a 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -30,6 +30,7 @@
 #include "sdlinput.h"
 #include "textfield.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 
 #include "../resources/image.h"
@@ -67,6 +68,7 @@ TextField::TextField(const std::string& text):
                         gridx[x], gridy[y],
                         gridx[x + 1] - gridx[x] + 1,
                         gridy[y + 1] - gridy[y] + 1);
+                skin.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }