summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-29 19:32:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-29 19:32:02 +0300
commite14030fd3e255cd7469cd2d63abc51b1faef52e4 (patch)
treeb880a043e06826162383198e5e89b167f2e5b4d0 /src/gui
parent83e5dc67b704b397d85df7d4f4cd48b6d239b875 (diff)
downloadmanaplus-e14030fd3e255cd7469cd2d63abc51b1faef52e4.tar.gz
manaplus-e14030fd3e255cd7469cd2d63abc51b1faef52e4.tar.bz2
manaplus-e14030fd3e255cd7469cd2d63abc51b1faef52e4.tar.xz
manaplus-e14030fd3e255cd7469cd2d63abc51b1faef52e4.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/itemcontainer.cpp6
-rw-r--r--src/gui/widgets/itemcontainer.h2
-rw-r--r--src/gui/widgets/serverslistbox.h6
-rw-r--r--src/gui/windows/inventorywindow.cpp4
4 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 54bb74596..d3a57a71b 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -379,12 +379,6 @@ void ItemContainer::distributeValueChangedEvent()
}
}
-void ItemContainer::hidePopup()
-{
- if (itemPopup)
- itemPopup->setVisible(false);
-}
-
void ItemContainer::keyPressed(KeyEvent &event A_UNUSED)
{
}
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 42b4fa036..9ee1eed31 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -68,8 +68,6 @@ class ItemContainer final : public Widget,
*/
~ItemContainer();
- void hidePopup();
-
/**
* Necessary for checking how full the inventory is.
*/
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index e8ce0365d..ed26a8d3b 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -114,9 +114,9 @@ class ServersListBox final : public ListBox
if (!info.description.empty())
{
font2->drawString(graphics,
- info.description,
- x,
- y + mPadding);
+ info.description,
+ x,
+ y + mPadding);
}
font2->drawString(graphics,
model->getElementAt(i),
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 2c38c0358..c1bdafe7b 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -39,6 +39,7 @@
#include "gui/models/sortlistmodelinv.h"
+#include "gui/popups/itempopup.h"
#include "gui/popups/popupmenu.h"
#include "gui/popups/textpopup.h"
@@ -414,7 +415,8 @@ void InventoryWindow::unselectItem()
void InventoryWindow::widgetHidden(const Event &event)
{
Window::widgetHidden(event);
- mItems->hidePopup();
+ if (itemPopup)
+ itemPopup->setVisible(false);
}
void InventoryWindow::mouseClicked(MouseEvent &event)