Merge branch 'aethyra/master'

Conflicts:
	Many files.

1 files changed, 23 insertions, 19 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 9a00f7a7..856d7d03 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -27,6 +27,7 @@
 #include "button.h"
 #include "equipmentwindow.h"
 #include "itempopup.h"
+#include "palette.h"
 #include "playerbox.h"
 #include "viewport.h"
 
@@ -62,6 +63,7 @@ EquipmentWindow::EquipmentWindow():
     mSelected(-1)
 {
     mItemPopup = new ItemPopup;
+    mItemPopup->setOpaque(false);
 
     // Control that shows the Player
     mPlayerBox = new PlayerBox;
@@ -70,7 +72,7 @@ EquipmentWindow::EquipmentWindow():
 
     setWindowName("Equipment");
     setCloseButton(true);
-    setDefaultSize(5, 195, 180, 300);
+    setDefaultSize(180, 300, ImageRect::CENTER);
     loadWindowState();
 
     mUnequip = new Button(_("Unequip"), "unequip", this);
@@ -112,6 +114,22 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
 
     for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
     {
+        if (i == mSelected)
+        {
+            const gcn::Color color = guiPalette->getColor(Palette::HIGHLIGHT);
+
+            // Set color to the highligh color
+            g->setColor(gcn::Color(color.r, color.g, color.b, getGuiAlpha()));
+            g->fillRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
+                                        BOX_WIDTH, BOX_HEIGHT));
+        }
+
+        // Set color black.
+        g->setColor(gcn::Color(0, 0, 0));
+        // Draw box border.
+        g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
+                                        BOX_WIDTH, BOX_HEIGHT));
+
         item = (i != EQUIP_AMMO_SLOT) ?
                mInventory->getItem(mEquipment->getEquipment(i)) :
                mInventory->getItem(mEquipment->getArrows());
@@ -122,28 +140,13 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             g->drawImage(image, mEquipBox[i].posX, mEquipBox[i].posY);
             if (i == EQUIP_AMMO_SLOT)
             {
-                g->setColor(gcn::Color(0, 0, 0));
+                g->setColor(guiPalette->getColor(Palette::TEXT));
                 graphics->drawText(toString(item->getQuantity()),
                                    mEquipBox[i].posX + (BOX_WIDTH / 2),
                                    mEquipBox[i].posY - getFont()->getHeight(),
                                    gcn::Graphics::CENTER);
             }
         }
-
-        if (i == mSelected)
-        {
-            // Set color red.
-            g->setColor(gcn::Color(255, 0, 0));
-        }
-        else
-        {
-            // Set color black.
-            g->setColor(gcn::Color(0, 0, 0));
-        }
-
-        // Draw box border.
-        g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
-            BOX_WIDTH, BOX_HEIGHT));
     }
 }
 
@@ -234,8 +237,9 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
         int mouseX, mouseY;
         SDL_GetMouseState(&mouseX, &mouseY);
 
-        mItemPopup->setItem(item->getInfo());
-        mItemPopup->setOpaque(false);
+        if (item->getInfo().getName() != mItemPopup->getItemName())
+            mItemPopup->setItem(item->getInfo());
+        mItemPopup->updateColors();
         mItemPopup->view(x + getX(), y + getY());
     }
     else