1 files changed, 53 insertions, 17 deletions

diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index d4c2bc4b..92837603 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2006  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
  */
 
@@ -23,6 +23,11 @@
 
 #include "dropdown.h"
 
+#include "../color.h"
+#include "../listbox.h"
+#include "../scrollarea.h"
+
+#include "../../configuration.h"
 #include "../../graphics.h"
 
 #include "../../resources/image.h"
@@ -33,12 +38,12 @@
 int DropDown::instances = 0;
 Image *DropDown::buttons[2][2];
 ImageRect DropDown::skin;
+float DropDown::mAlpha = config.getValue("guialpha", 0.8);
 
-DropDown::DropDown(gcn::ListModel *listModel,
-                   gcn::ScrollArea *scrollArea,
-                   gcn::ListBox *listBox):
-                   gcn::DropDown::DropDown(listModel,
-                   scrollArea, listBox)
+DropDown::DropDown(gcn::ListModel *listModel, gcn::ScrollArea *scrollArea,
+                   gcn::ListBox *listBox, bool opacity):
+    gcn::DropDown::DropDown(listModel, scrollArea, listBox),
+    mOpaque(opacity)
 {
     setFrameSize(2);
 
@@ -58,6 +63,11 @@ DropDown::DropDown(gcn::ListModel *listModel,
         buttons[0][1] =
             resman->getImage("graphics/gui/vscroll_down_pressed.png");
 
+        buttons[0][0]->setAlpha(mAlpha);
+        buttons[0][1]->setAlpha(mAlpha);
+        buttons[1][0]->setAlpha(mAlpha);
+        buttons[1][1]->setAlpha(mAlpha);
+
         // get the border skin
         Image *boxBorder = resman->getImage("graphics/gui/deepbox.png");
         int gridx[4] = {0, 3, 28, 31};
@@ -70,6 +80,7 @@ DropDown::DropDown(gcn::ListModel *listModel,
                         gridx[x], gridy[y],
                         gridx[x + 1] - gridx[x] + 1,
                         gridy[y + 1] - gridy[y] + 1);
+                skin.grid[a]->setAlpha(mAlpha);
                 a++;
             }
         }
@@ -108,19 +119,44 @@ void DropDown::draw(gcn::Graphics* graphics)
         h = getHeight();
     }
 
-    int alpha = getBaseColor().a;
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+    {
+        mAlpha = config.getValue("guialpha", 0.8);
+
+        buttons[0][0]->setAlpha(mAlpha);
+        buttons[0][1]->setAlpha(mAlpha);
+        buttons[1][0]->setAlpha(mAlpha);
+        buttons[1][1]->setAlpha(mAlpha);
+
+        for (int a = 0; a < 9; a++)
+        {
+            skin.grid[a]->setAlpha(mAlpha);
+        }
+    }
+
+    bool valid;
+    const int alpha = (int)(mAlpha * 255.0f);
     gcn::Color faceColor = getBaseColor();
     faceColor.a = alpha;
-    gcn::Color highlightColor = faceColor + 0x303030;
+    gcn::Color highlightColor = textColor->getColor('H', valid);
     highlightColor.a = alpha;
     gcn::Color shadowColor = faceColor - 0x303030;
     shadowColor.a = alpha;
 
+    if (mOpaque)
+    {
+        int red = getBackgroundColor().r;
+        int green = getBackgroundColor().g;
+        int blue = getBackgroundColor().b;
+        graphics->setColor(gcn::Color(red, green, blue, alpha));
+        graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), h));
+
+        red = getForegroundColor().r;
+        green = getForegroundColor().g;
+        blue = getForegroundColor().b;
+        graphics->setColor(gcn::Color(red, green, blue, alpha));
+    }
 
-    graphics->setColor(getBackgroundColor());
-    graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), h));
-
-    graphics->setColor(getForegroundColor());
     graphics->setFont(getFont());
 
     if (mListBox->getListModel() && mListBox->getSelected() >= 0)
@@ -140,7 +176,7 @@ void DropDown::draw(gcn::Graphics* graphics)
     {
         drawChildren(graphics);
 
-        // Draw two lines separating the ListBox with se selected
+        // Draw two lines separating the ListBox with selected
         // element view.
         graphics->setColor(highlightColor);
         graphics->drawLine(0, h, getWidth(), h);
@@ -163,5 +199,5 @@ void DropDown::drawButton(gcn::Graphics *graphics)
     int height = mDroppedDown ? mFoldedUpHeight : getHeight();
 
     static_cast<Graphics*>(graphics)->
-        drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1);
+        drawImage(buttons[mDroppedDown][mPushed], getWidth() - height + 2, 1);
 }