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

fixed history

Browse Source
This commit is contained in:
krepa098 2015-01-03 14:08:04 +01:00
parent d7f5068fbf
commit 8a1ea18ed4
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/widget/form/chatform.cpp
View File

@ -703,7 +703,6 @@ void ChatForm::loadHistory(QDateTime since, bool processUndelivered)
std::swap(storedPrevId, previousId); std::swap(storedPrevId, previousId);
QList<ChatMessage*> historyMessages; QList<ChatMessage*> historyMessages;
//TODO: possibly broken
QDate lastDate(1,0,0); QDate lastDate(1,0,0);
for (const auto &it : msgs) for (const auto &it : msgs)
{ {
@ -720,12 +719,11 @@ void ChatForm::loadHistory(QDateTime since, bool processUndelivered)
ToxID msgSender = ToxID::fromString(it.sender); ToxID msgSender = ToxID::fromString(it.sender);
bool isAction = it.message.startsWith("/me "); bool isAction = it.message.startsWith("/me ");
ChatMessage* msg;
QString authorStr = (msgSender.isMine() ? Core::getInstance()->getUsername() : resolveToxID(msgSender)); ChatMessage* msg = addMessage(msgSender,
if (!isAction) isAction ? it.message.right(it.message.length() - 4) : it.message,
msg = chatWidget->addChatMessage(authorStr, it.message, msgSender.isMine(), false); isAction, QDateTime::currentDateTime(),
else false);
msg = chatWidget->addChatAction(authorStr, it.message.right(it.message.length() - 4));
if (it.isSent || !msgSender.isMine()) if (it.isSent || !msgSender.isMine())
{ {
@ -747,15 +745,15 @@ void ChatForm::loadHistory(QDateTime since, bool processUndelivered)
} }
std::swap(storedPrevId, previousId); std::swap(storedPrevId, previousId);
// int savedSliderPos = chatWidget->verticalScrollBar()->maximum() - chatWidget->verticalScrollBar()->value(); // int savedSliderPos = chatWidget->verticalScrollBar()->maximum() - chatWidget->verticalScrollBar()->value();
// if (earliestMessage != nullptr) // if (earliestMessage != nullptr)
// *earliestMessage = since; // *earliestMessage = since;
// chatWidget->insertMessagesTop(historyMessages); // chatWidget->insertMessagesTop(historyMessages);
// savedSliderPos = chatWidget->verticalScrollBar()->maximum() - savedSliderPos; // savedSliderPos = chatWidget->verticalScrollBar()->maximum() - savedSliderPos;
// chatWidget->verticalScrollBar()->setValue(savedSliderPos); // chatWidget->verticalScrollBar()->setValue(savedSliderPos);
} }
void ChatForm::onLoadHistory() void ChatForm::onLoadHistory()