summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/itemshortcutwindow.h2
-rw-r--r--src/gui/menuwindow.cpp7
3 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 3e7541cf..bcb4ac0a 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -208,7 +208,7 @@ Gui::draw()
Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1)) &&
- mCustomCursor)
+ mCustomCursor)
{
static_cast<Graphics*>(mGraphics)->drawImage(
mMouseCursor->get(mCursorType),
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 54611efe..16a06b55 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -65,5 +65,7 @@ class ItemShortcutWindow : public Window
gcn::ScrollArea *mInvenScroll;
};
+
extern ItemShortcutWindow *itemShortcutWindow;
+
#endif
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index c7505bae..e6b35f5a 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -118,9 +118,12 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
{
window = setupWindow;
}
- if (window) {
+
+ if (window)
+ {
window->setVisible(!window->isVisible());
- if (window->isVisible()) {
+ if (window->isVisible())
+ {
window->requestMoveToTop();
}
}