- qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f))->x();
- QRectF selectRect(left, 0, width() - left, height());
- painter->fillRect(selectRect, QApplication::palette().brush(QPalette::Highlight));
+ QTextCharFormat selFmt = QtUi::style()->format(UiStyle::formatType(type), label | UiStyle::Selected);
+ if(selFmt.hasProperty(QTextFormat::BackgroundBrush)) {
+ qreal left = item((ChatLineModel::ColumnType)(_selection & ItemMask)).x();
+ QRectF selectRect(left, 0, width() - left, height());
+ painter->fillRect(selectRect, selFmt.background());
+ }
+ }
+
+ // new line marker
+ if(model_ && row() > 0 && chatScene()->isSingleBufferScene()) {
+ QModelIndex prevRowIdx = model_->index(row() - 1, 0);
+ MsgId prevMsgId = prevRowIdx.data(MessageModel::MsgIdRole).value<MsgId>();
+ MsgId myMsgId = myIdx.data(MessageModel::MsgIdRole).value<MsgId>();
+ Message::Flags flags = (Message::Flags)myIdx.data(MessageModel::FlagsRole).toInt();
+
+ // don't show the marker if we wrote that new line
+ if(!(flags & Message::Self)) {
+ BufferId bufferId = BufferId(chatScene()->idString().toInt());
+ MsgId lastSeenMsgId = Client::networkModel()->lastSeenMarkerMsgId(bufferId);
+ if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) {
+ QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing());
+ gradient.setColorAt(0, QtUi::style()->brush(UiStyle::MarkerLine).color()); // FIXME: Use full (gradient?) brush instead of just the color
+ gradient.setColorAt(0.1, Qt::transparent);
+ painter->fillRect(boundingRect(), gradient);
+ }
+ }