diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-30 12:46:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-30 12:46:49 +0300 |
| commit | 9bb11133522836a9c5e251550ac88c9a4e091c0e (patch) | |
| tree | f65703ac1a51b79a0766c48420769d28d0847f41 /src/gui/widgets/tabs/chattab.cpp | |
| parent | e55ed9a138e97f6fba5e3b6858a755f8a50197d2 (diff) | |
| download | manaverse-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.gz manaverse-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.bz2 manaverse-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.xz manaverse-9bb11133522836a9c5e251550ac88c9a4e091c0e.zip | |
Move main window related code into windowmanager.
Diffstat (limited to 'src/gui/widgets/tabs/chattab.cpp')
| -rw-r--r-- | src/gui/widgets/tabs/chattab.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp index 893149a98..36e4b5437 100644 --- a/src/gui/widgets/tabs/chattab.cpp +++ b/src/gui/widgets/tabs/chattab.cpp @@ -27,12 +27,14 @@ #include "commands.h" #include "commandhandler.h" #include "configuration.h" +#include "settings.h" #include "soundconsts.h" #include "soundmanager.h" #include "being/localplayer.h" #include "gui/chatlog.h" +#include "gui/windowmanager.h" #include "gui/windows/chatwindow.h" #include "gui/windows/helpwindow.h" @@ -320,8 +322,9 @@ void ChatTab::chatLog(std::string line, ChatMsgType::Type own, if ((getAllowHighlight() || own == ChatMsgType::BY_GM) && (this != tabArea->getSelectedTab() - || (client->getIsMinimized() || (!client->getMouseFocused() - && !client->getInputFocused())))) + || (WindowManager::getIsMinimized() + || (!settings.mouseFocused + && !settings.inputFocused)))) { if (own == ChatMsgType::BY_GM) { @@ -335,7 +338,7 @@ void ChatTab::chatLog(std::string line, ChatMsgType::Type own, chatWindow->unHideWindow(); playNewMessageSound(); } - client->newChatMessage(); + WindowManager::newChatMessage(); } } } |