From 99bdcc0bbd6ec410958d8edf320a5ba6f1dba55a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 27 Mar 2012 16:51:24 +0300 Subject: Unselect item in inventory if it was added to outfit window. --- src/gui/inventorywindow.cpp | 5 +++++ src/gui/inventorywindow.h | 5 +++++ src/gui/outfitwindow.cpp | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index c3d5460ce..7ceeb6e34 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -373,6 +373,11 @@ Item *InventoryWindow::getSelectedItem() const return mItems->getSelectedItem(); } +void InventoryWindow::unselectItem() +{ + mItems->selectNone(); +} + void InventoryWindow::widgetHidden(const gcn::Event &event) { Window::widgetHidden(event); diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 47194b909..c4e0f66a6 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -77,6 +77,11 @@ class InventoryWindow : public Window, */ Item* getSelectedItem() const; + /** + * Unselect item + */ + void unselectItem(); + /** * Handles closing of the window */ diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 009b92e73..502e9d96b 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -34,6 +34,7 @@ #include "playerinfo.h" #include "gui/chatwindow.h" +#include "gui/inventorywindow.h" #include "gui/theme.h" #include "gui/viewport.h" @@ -422,7 +423,9 @@ void OutfitWindow::mousePressed(gcn::MouseEvent &event) { mItems[mCurrentOutfit][index] = mItemSelected; mItemColors[mCurrentOutfit][index] = mItemColorSelected; -// mItemSelected = -1; + + if (inventoryWindow) + inventoryWindow->unselectItem(); } else if (mItems[mCurrentOutfit][index]) { -- cgit v1.2.3-60-g2f50