// contentsItem doesn't need a geom change as it's Pos is changed (ensured by void ChatScene::firstHandlePositionChanged(qreal xpos))
qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
linePos -= height;
- bool needGeometryChange = linePos == pos().y() && height != _height;
+ bool needGeometryChange = linePos == pos().y();
if(needGeometryChange) {
_timestampItem.prepareGeometryChange();
_contentsItem.setPos(contentsPos);
- _timestampItem.clearLayout();
_senderItem.clearLayout();
+ _contentsItem.clearLayout();
if(needGeometryChange)
prepareGeometryChange();
// new line marker
const QAbstractItemModel *model_ = model();
- if(model_ && row() > 0) {
+ if(model_ && row() > 0 && chatScene()->isSingleBufferScene()) {
QModelIndex prevRowIdx = model_->index(row() - 1, 0);
- MsgId msgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value<MsgId>();
- Message::Flags flags = (Message::Flags)model_->data(model_->index(row(), 0), MessageModel::FlagsRole).toInt();
+ MsgId prevMsgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value<MsgId>();
+ QModelIndex myIdx = model_->index(row(), 0);
+ MsgId myMsgId = model_->data(myIdx, MessageModel::MsgIdRole).value<MsgId>();
+ Message::Flags flags = (Message::Flags)model_->data(myIdx, MessageModel::FlagsRole).toInt();
// don't show the marker if we wrote that new line
if(!(flags & Message::Self)) {
- BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value<BufferId>();
- if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) {
+ BufferId bufferId = BufferId(chatScene()->idString().toInt());
+ MsgId lastSeenMsgId = Client::networkModel()->lastSeenMarkerMsgId(bufferId);
+ if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) {
QtUiStyleSettings s("Colors");
QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing());
gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value<QColor>());