diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-08-22 09:05:24 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-08-22 09:05:24 +0000 |
| commit | 353560a2829fb9b1d9d26121658ce83589c4f5ef (patch) | |
| tree | a4eeb6f2f4f6d7eacdea7016fa8df034efd6788c /src/gui | |
| parent | a444a76ed37a52ba0004298f2512bee1c75273bc (diff) | |
| download | mana-353560a2829fb9b1d9d26121658ce83589c4f5ef.tar.gz mana-353560a2829fb9b1d9d26121658ce83589c4f5ef.tar.bz2 mana-353560a2829fb9b1d9d26121658ce83589c4f5ef.tar.xz mana-353560a2829fb9b1d9d26121658ce83589c4f5ef.zip | |
Added close button and item shortcut backgrounds to files that will be
installed.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/gui.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemshortcutwindow.h | 2 | ||||
| -rw-r--r-- | src/gui/menuwindow.cpp | 7 |
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(); } } |