1 files changed, 26 insertions, 22 deletions

diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 204d7961..74d0b9ad 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -1,70 +1,74 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "listbox.h"
-
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/listmodel.hpp>
-#include <guichan/mouseinput.hpp>
+
+#include "color.h"
+#include "listbox.h"
+
+#include "../configuration.h"
+
+float ListBox::mAlpha = config.getValue("guialpha", 0.8);
 
 ListBox::ListBox(gcn::ListModel *listModel):
     gcn::ListBox(listModel)
 {
 }
 
-ListBox::ListBox():
-    gcn::ListBox()
-{
-    
-}
-
 void ListBox::draw(gcn::Graphics *graphics)
 {
     if (!mListModel)
         return;
 
-    graphics->setColor(gcn::Color(110, 160, 255));
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+        mAlpha = config.getValue("guialpha", 0.8);
+
+    bool valid;
+    const int red = (textColor->getColor('H', valid) >> 16) & 0xFF;
+    const int green = (textColor->getColor('H', valid) >> 8) & 0xFF;
+    const int blue = textColor->getColor('H', valid) & 0xFF;
+    const int alpha = (int)(mAlpha * 255.0f);
+
+    graphics->setColor(gcn::Color(red, green, blue, alpha));
     graphics->setFont(getFont());
 
-    int fontHeight = getFont()->getHeight();
+    const int fontHeight = getFont()->getHeight();
 
     // Draw rectangle below the selected list element
-    if (mSelected >= 0) {
+    if (mSelected >= 0)
         graphics->fillRectangle(gcn::Rectangle(0, fontHeight * mSelected,
                                                getWidth(), fontHeight));
-    }
 
     // Draw the list elements
-    graphics->setColor(gcn::Color(0, 0, 0));
-    for (int i = 0, y = 0;
-         i < mListModel->getNumberOfElements();
+    graphics->setColor(gcn::Color(0, 0, 0, 255));
+    for (int i = 0, y = 0; i < mListModel->getNumberOfElements();
          ++i, y += fontHeight)
     {
         graphics->drawText(mListModel->getElementAt(i), 1, y);
     }
 }
 
-void
-ListBox::mouseDragged(gcn::MouseEvent &event)
+void ListBox::mouseDragged(gcn::MouseEvent &event)
 {
     // Pretend mouse is pressed continuously while dragged. Causes list
     // selection to be updated as is default in many GUIs.