summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-08 18:01:40 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-08 18:01:40 +0300
commit6303e605ef23003aabace85cde3f04574f1fb05c (patch)
tree6c9477f7314e4d371081473d7b96503b47573dea /src/gui/widgets
parent568cd6279a753b1f04afb08a9193ab0873bf8e53 (diff)
downloadmanaverse-6303e605ef23003aabace85cde3f04574f1fb05c.tar.gz
manaverse-6303e605ef23003aabace85cde3f04574f1fb05c.tar.bz2
manaverse-6303e605ef23003aabace85cde3f04574f1fb05c.tar.xz
manaverse-6303e605ef23003aabace85cde3f04574f1fb05c.zip
In whisper constructor allow separatly set nick and caption.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp3
-rw-r--r--src/gui/widgets/tabs/chat/whispertab.cpp3
-rw-r--r--src/gui/widgets/tabs/chat/whispertab.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index a351c7199..53e4684d4 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -470,8 +470,9 @@ void AvatarListBox::mousePressed(MouseEvent &event)
{
if (type == MapItemType::EMPTY && chatWindow)
{
+ const std::string &name = model->getAvatarAt(selected)->getName();
const WhisperTab *const tab = chatWindow->addWhisperTab(
- model->getAvatarAt(selected)->getName(), true);
+ name, name, true);
if (tab)
chatWindow->saveState();
}
diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index 53712c6b2..5ca65f580 100644
--- a/src/gui/widgets/tabs/chat/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -35,8 +35,9 @@
#include "debug.h"
WhisperTab::WhisperTab(const Widget2 *const widget,
+ const std::string &caption,
const std::string &nick) :
- ChatTab(widget, nick, nick, nick, ChatTabType::WHISPER),
+ ChatTab(widget, caption, nick, nick, ChatTabType::WHISPER),
mNick(nick)
{
setWhisperTabColors();
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index 24fc2abe0..677e8b470 100644
--- a/src/gui/widgets/tabs/chat/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -57,6 +57,7 @@ class WhisperTab final : public ChatTab
* @param nick the name of the player this tab is whispering to
*/
WhisperTab(const Widget2 *const widget,
+ const std::string &caption,
const std::string &nick);
~WhisperTab();