diff options
author | Stefan Dombrowski <stefan@uni-bonn.de> | 2010-08-19 16:22:40 +0200 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-19 08:48:34 -0600 |
commit | db0f5e2a332f82c006729146727d37315de7dfda (patch) | |
tree | 0a65d27cd49540e380112be0e348f322adc5925b /src/gui | |
parent | af7bbb7b4404439580666b31388dd8dbef481011 (diff) | |
download | mana-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>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/sell.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/shoplistbox.cpp | 11 | ||||
-rw-r--r-- | src/gui/widgets/shoplistbox.h | 13 |
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; |