From db0f5e2a332f82c006729146727d37315de7dfda Mon Sep 17 00:00:00 2001
From: Stefan Dombrowski <stefan@uni-bonn.de>
Date: Thu, 19 Aug 2010 16:22:40 +0200
Subject: Fixing some bugs in NPC-shop gui

* Price and total money is now shown from the beginning in sell dialog.
* Item popup is set invisible when mouse has moved away from items.
* Item popup gets deleted when shop closes.

Signed-off-by: Jared Adams <jaxad0127@gmail.com>
---
 src/gui/sell.cpp                |  2 ++
 src/gui/widgets/shoplistbox.cpp | 11 +++++++++++
 src/gui/widgets/shoplistbox.h   | 13 +++++++++++++
 3 files changed, 26 insertions(+)

(limited to 'src/gui')

diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 69ff7ed2..13e0ba99 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -242,6 +242,8 @@ void SellDialog::setMoney(int amount)
 {
     mPlayerMoney = amount;
     mShopItemList->setPlayersMoney(amount);
+
+    updateButtonsAndLabels();
 }
 
 void SellDialog::updateButtonsAndLabels()
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 2f5fab34..a5033570 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -61,6 +61,11 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
     mItemPopup = new ItemPopup;
 }
 
+ShopListBox::~ShopListBox()
+{
+    delete mItemPopup;
+}
+
 void ShopListBox::setPlayersMoney(int money)
 {
     mPlayerMoney = money;
@@ -167,3 +172,9 @@ void ShopListBox::mouseMoved(gcn::MouseEvent &event)
         }
     }
 }
+
+void ShopListBox::mouseExited(gcn::MouseEvent &event)
+{
+    mItemPopup->setVisible(false);
+}
+
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 062ad93a..9232a5a4 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -47,6 +47,11 @@ class ShopListBox : public ListBox
          */
         ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel);
 
+        /**
+         * Deconstructor
+         */
+        ~ShopListBox();
+
         /**
          * Draws the list box.
          */
@@ -73,8 +78,16 @@ class ShopListBox : public ListBox
          */
         void setPriceCheck(bool check);
 
+        /**
+         ** Show ItemTooltip
+         */
         void mouseMoved(gcn::MouseEvent &event);
 
+        /**
+         ** Hide ItemTooltip
+         */
+         void mouseExited(gcn::MouseEvent &event);
+
     private:
         int mPlayerMoney;
 
-- 
cgit v1.2.3-70-g09d2