X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fchatline.cpp;h=4e03f064bcb98ef5c0f116a40457d6427c4fe271;hb=6e50e532fa24b8e36237eb7ae9c5c9b21058519f;hp=3e7167bcee2ac17824db8b72cda9ceb679ab6afb;hpb=533eaaeda64759c01daa624365b8fc63eeba5ccf;p=quassel.git diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index 3e7167bc..4e03f064 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -28,7 +28,9 @@ #include "chatitem.h" #include "chatline.h" #include "messagemodel.h" +#include "networkmodel.h" #include "qtui.h" +#include "qtuisettings.h" ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent) : QGraphicsItem(parent), @@ -109,12 +111,6 @@ void ChatLine::setHighlighted(bool highlighted) { } void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { -// const QAbstractItemModel *model_ = model(); -// if(model_ && row() > 0) { -// MsgId msgId = model_->data(model_->index(row() - 1, 0), MessageModel::MsgIdRole).value(); -// BufferId bufferId = model_->data(model_->index(row() - 1, 0), MessageModel::BufferIdRole).value(); -// qDebug() << msgId; -// } if(_selection & Highlighted) { painter->fillRect(boundingRect(), QBrush(QtUi::style()->highlightColor())); } @@ -123,4 +119,23 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QRectF selectRect(left, 0, width() - left, height()); painter->fillRect(selectRect, QApplication::palette().brush(QPalette::Highlight)); } + + // new line marker + const QAbstractItemModel *model_ = model(); + if(model_ && row() > 0) { + QModelIndex prevRowIdx = model_->index(row() - 1, 0); + MsgId msgId = model_->data(prevRowIdx, MessageModel::MsgIdRole).value(); + Message::Flags flags = (Message::Flags)model_->data(model_->index(row(), 0), 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(); + if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) { + QtUiSettings s("QtUiStyle/Colors"); + QLinearGradient gradient(0, 0, 0, height()); + gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value()); + gradient.setColorAt(0.1, Qt::transparent); + painter->fillRect(boundingRect(), gradient); + } + } + } }