diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/widgets/chatinput.h | 103 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 70 |
4 files changed, 106 insertions, 69 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6d20e489..08b278a76 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,6 +126,7 @@ SET(SRCS gui/widgets/tabs/chattab.cpp gui/widgets/tabs/chattab.h gui/widgets/tabs/chattabtype.h + gui/widgets/chatinput.h gui/widgets/checkbox.cpp gui/widgets/checkbox.h gui/models/colormodel.cpp diff --git a/src/Makefile.am b/src/Makefile.am index cb3e94ea6..7688d13b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -217,6 +217,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/tabs/chattab.cpp \ gui/widgets/tabs/chattab.h \ gui/widgets/tabs/chattabtype.h \ + gui/widgets/chatinput.h \ gui/widgets/checkbox.cpp \ gui/widgets/checkbox.h \ gui/models/colormodel.cpp \ diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h new file mode 100644 index 000000000..1079a219d --- /dev/null +++ b/src/gui/widgets/chatinput.h @@ -0,0 +1,103 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef GUI_WIDGETS_CHATINPUT_H +#define GUI_WIDGETS_CHATINPUT_H + +#include "gui/windows/chatwindow.h" + +#include "configuration.h" + +#include "gui/widgets/textfield.h" + +#include "localconsts.h" + +/** + * The chat input hides when it loses focus. It is also invisible by default. + */ +class ChatInput final : public TextField +{ + public: + explicit ChatInput(ChatWindow *const window): + TextField(window, "", false), + mWindow(window), + mFocusGaining(false) + { + setVisible(false); + addFocusListener(this); + } + + A_DELETE_COPY(ChatInput) + + /** + * Called if the chat input loses focus. It will set itself to + * invisible as result. + */ + void focusLost(const Event &event) + { + TextField::focusLost(event); + if (mFocusGaining || !config.getBoolValue("protectChatFocus")) + { + processVisible(false); + if (chatWindow) + chatWindow->updateVisibility(); + mFocusGaining = false; + return; + } + mFocusGaining = true; + requestFocus(); + mFocusGaining = false; + } + + void processVisible(const bool n) + { + if (!mWindow || isVisible() == n) + return; + + if (!n) + mFocusGaining = true; + setVisible(n); + if (config.getBoolValue("hideChatInput") + || config.getBoolValue("showEmotesButton")) + { + mWindow->adjustTabSize(); + } + if (emoteWindow) + { + emoteWindow->hide(); + } + } + + void unprotectFocus() + { mFocusGaining = true; } + + void setVisible(bool visible) + { + TextField::setVisible(visible); + } + + private: + ChatWindow *mWindow; + bool mFocusGaining; +}; + +#endif // GUI_WIDGETS_CHATINPUT_H diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index f8337fff6..bd40d8084 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -56,6 +56,7 @@ #include "gui/widgets/tabs/battletab.h" #include "gui/widgets/button.h" +#include "gui/widgets/chatinput.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/scrollarea.h" @@ -83,75 +84,6 @@ #include "debug.h" -/** - * The chat input hides when it loses focus. It is also invisible by default. - */ -class ChatInput final : public TextField -{ - public: - explicit ChatInput(ChatWindow *const window): - TextField(window, "", false), - mWindow(window), - mFocusGaining(false) - { - setVisible(false); - addFocusListener(this); - } - - A_DELETE_COPY(ChatInput) - - /** - * Called if the chat input loses focus. It will set itself to - * invisible as result. - */ - void focusLost(const Event &event) - { - TextField::focusLost(event); - if (mFocusGaining || !config.getBoolValue("protectChatFocus")) - { - processVisible(false); - if (chatWindow) - chatWindow->updateVisibility(); - mFocusGaining = false; - return; - } - mFocusGaining = true; - requestFocus(); - mFocusGaining = false; - } - - void processVisible(const bool n) - { - if (!mWindow || isVisible() == n) - return; - - if (!n) - mFocusGaining = true; - setVisible(n); - if (config.getBoolValue("hideChatInput") - || config.getBoolValue("showEmotesButton")) - { - mWindow->adjustTabSize(); - } - if (emoteWindow) - { - emoteWindow->hide(); - } - } - - void unprotectFocus() - { mFocusGaining = true; } - - void setVisible(bool visible) - { - TextField::setVisible(visible); - } - - private: - ChatWindow *mWindow; - bool mFocusGaining; -}; - static const char *const ACTION_COLOR_PICKER = "color picker"; ChatWindow::ChatWindow(): |