Browse Source

fixed history

pull/974/head
krepa098 11 years ago
parent
commit
8a1ea18ed4
  1. 24
      src/widget/form/chatform.cpp

24
src/widget/form/chatform.cpp

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

Loading…
Cancel
Save