mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
fix #243 : Smileys are broken
This commit is contained in:
parent
c54cfd6ff3
commit
24971f50e9
|
@ -218,8 +218,6 @@ void ChatForm::addMessage(QString author, QString message, QString date)
|
|||
|
||||
void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
|
||||
{
|
||||
message->setText(SmileyPack::getInstance().smileyfied(message->text()));
|
||||
|
||||
QScrollBar* scroll = chatArea->verticalScrollBar();
|
||||
lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
|
||||
author->setAlignment(Qt::AlignTop | Qt::AlignRight);
|
||||
|
@ -262,6 +260,7 @@ void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
|
|||
finalMessage += "<br>";
|
||||
}
|
||||
message->setText(finalMessage.left(finalMessage.length()-4));
|
||||
message->setText(SmileyPack::getInstance().smileyfied(message->text()));
|
||||
message->setTextFormat(Qt::RichText);
|
||||
|
||||
mainChatLayout->addWidget(author, curRow, 0);
|
||||
|
|
Loading…
Reference in New Issue
Block a user