X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=278c1de4676e628b3917ffb504ac6238599e5be4;hp=1ef2f3741066589c04cfc223655b1e26522306e2;hb=f448828fb29f3d23d9306f777cd264a13fde0e9a;hpb=c902a2a58671e7d145f5e879d87100844bd20df4

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 1ef2f374..278c1de4 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -75,9 +75,6 @@ void ChatLine::setFirstColumn(const qreal &timestampWidth, const qreal &senderWi
   // senderItem doesn't need a geom change as it's Pos is changed (ensured by void ChatScene::firstHandlePositionChanged(qreal xpos))
   _senderItem.setGeometry(senderWidth, _height);
   _senderItem.setPos(senderPos);
-
-  _timestampItem.clearLayout();
-  _senderItem.clearLayout();
 }
 
 // NOTE: contentsPos is in ChatLines coordinate system!
@@ -86,7 +83,7 @@ void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWi
   // 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();
@@ -97,9 +94,6 @@ void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWi
 
   _contentsItem.setPos(contentsPos);
 
-  _timestampItem.clearLayout();
-  _senderItem.clearLayout();
-
   if(needGeometryChange)
     prepareGeometryChange();
 
@@ -119,7 +113,6 @@ void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth
   }
   _timestampItem.setHeight(height);
   _senderItem.setHeight(height);
-  _contentsItem.clearLayout();
 
   if(needGeometryChange)
     prepareGeometryChange();
@@ -172,14 +165,17 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
   // 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>());