summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-08-19 16:22:40 +0200
committerJared Adams <jaxad0127@gmail.com>2010-08-19 08:48:34 -0600
commitdb0f5e2a332f82c006729146727d37315de7dfda (patch)
tree0a65d27cd49540e380112be0e348f322adc5925b
parentaf7bbb7b4404439580666b31388dd8dbef481011 (diff)
downloadmana-client-db0f5e2a332f82c006729146727d37315de7dfda.tar.gz
mana-client-db0f5e2a332f82c006729146727d37315de7dfda.tar.bz2
mana-client-db0f5e2a332f82c006729146727d37315de7dfda.tar.xz
mana-client-db0f5e2a332f82c006729146727d37315de7dfda.zip
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>
-rw-r--r--src/gui/sell.cpp2
-rw-r--r--src/gui/widgets/shoplistbox.cpp11
-rw-r--r--src/gui/widgets/shoplistbox.h13
3 files changed, 26 insertions, 0 deletions
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
@@ -48,6 +48,11 @@ class ShopListBox : public ListBox
ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel);
/**
+ * Deconstructor
+ */
+ ~ShopListBox();
+
+ /**
* Draws the list box.
*/
void draw(gcn::Graphics *graphics);
@@ -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;