StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix #243 : Smileys are broken

Browse Source
This commit is contained in:
apprb 2014-09-01 18:55:07 +07:00
parent c54cfd6ff3
commit 24971f50e9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widget/form/chatform.cpp
View File

@ -218,8 +218,6 @@ void ChatForm::addMessage(QString author, QString message, QString date)
void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date) void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
{ {
message->setText(SmileyPack::getInstance().smileyfied(message->text()));
QScrollBar* scroll = chatArea->verticalScrollBar(); QScrollBar* scroll = chatArea->verticalScrollBar();
lockSliderToBottom = scroll && scroll->value() == scroll->maximum(); lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
author->setAlignment(Qt::AlignTop | Qt::AlignRight); author->setAlignment(Qt::AlignTop | Qt::AlignRight);
@ -262,6 +260,7 @@ void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
finalMessage += "<br>"; finalMessage += "<br>";
} }
message->setText(finalMessage.left(finalMessage.length()-4)); message->setText(finalMessage.left(finalMessage.length()-4));
message->setText(SmileyPack::getInstance().smileyfied(message->text()));
message->setTextFormat(Qt::RichText); message->setTextFormat(Qt::RichText);
mainChatLayout->addWidget(author, curRow, 0); mainChatLayout->addWidget(author, curRow, 0);