3 files changed, 30 insertions, 5 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 91ab38e8..212dcd2b 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -192,6 +192,19 @@ Item *EquipmentWindow::getItem(int x, int y) const
     return 0;
 }
 
+const std::string EquipmentWindow::getSlotName(int x, int y) const
+{
+    for (int i = 0; i < mBoxesNumber; ++i)
+    {
+        gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
+                             BOX_WIDTH, BOX_HEIGHT);
+
+        if (tRect.isPointInRect(x, y))
+            return mEquipment->getSlotName(i);
+    }
+    return std::string();
+}
+
 void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
 {
     Window::mousePressed(mouseEvent);
@@ -231,15 +244,23 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
     const int x = event.getX();
     const int y = event.getY();
 
-    Item *item = getItem(x, y);
+    int mouseX, mouseY;
+    SDL_GetMouseState(&mouseX, &mouseY);
 
     // Show ItemTooltip
-    if (item)
+    std::string slotName = getSlotName(x, y);
+    if (!slotName.empty())
     {
-        int mouseX, mouseY;
-        SDL_GetMouseState(&mouseX, &mouseY);
+        mItemPopup->setEquipmentText(slotName);
+
+        Item *item = getItem(x, y);
+        if (item)
+        {
+            mItemPopup->setItem(item->getInfo());
+        }
+        else
+            mItemPopup->setNoItem();
 
-        mItemPopup->setItem(item->getInfo());
         mItemPopup->position(x + getX(), y + getY());
     }
     else
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 0001dd4e..b8e63efc 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -79,6 +79,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener
         void mouseMoved(gcn::MouseEvent &event);
 
         Item *getItem(int x, int y) const;
+        const std::string getSlotName(int x, int y) const;
 
         void setSelected(int index);
 
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index de8378d5..d65764a5 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -145,6 +145,9 @@ void ItemPopup::setNoItem()
     mItemName->setForegroundColor(Theme::getThemeColor(Theme::GENERIC));
     mItemName->setPosition(getPadding(), getPadding());
 
+    mItemDesc->setText(std::string());
+    mItemEffect->setText(std::string());
+
     setContentSize(mItemName->getWidth() + 2 * getPadding(), 0);
 }