X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=bac4991a719f215b4ac48460c2821d9627d8ecc9;hp=1a8501c7316840b1f4a3c8e7159b2aa55ba998ae;hb=b4f1d778d8ea3bf86ddf1764314132e5eb9ef296;hpb=ba934ceb1bfe30d01d5fb5c072c3197f8080be04

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 1a8501c7..bac4991a 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -34,26 +34,27 @@
 #include "qtuisettings.h"
 #include "qtuistyle.h"
 
-ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent)
+ChatLine::ChatLine(int row, QAbstractItemModel *model,
+		   const qreal &width,
+		   const qreal &timestampWidth, const qreal &senderWidth, const qreal &contentsWidth,
+		   const QPointF &senderPos, const QPointF &contentsPos,
+		   QGraphicsItem *parent)
   : QGraphicsItem(parent),
     _row(row), // needs to be set before the items
-    _timestampItem(model, this),
-    _senderItem(model, this),
-    _contentsItem(model, this),
-    _width(0),
-    _height(0),
+    _model(model),
+    _contentsItem(contentsWidth, contentsPos, this),
+    _senderItem(senderWidth, _contentsItem.height(), senderPos, this),
+    _timestampItem(timestampWidth, _contentsItem.height(), this),
+    _width(width),
+    _height(_contentsItem.height()),
     _selection(0)
 {
   Q_ASSERT(model);
   QModelIndex index = model->index(row, ChatLineModel::ContentsColumn);
+  setZValue(0);
   setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight);
 }
 
-QRectF ChatLine::boundingRect () const {
-  //return childrenBoundingRect();
-  return QRectF(0, 0, _width, _height);
-}
-
 ChatItem &ChatLine::item(ChatLineModel::ColumnType column) {
   switch(column) {
     case ChatLineModel::TimestampColumn:
@@ -67,26 +68,71 @@ ChatItem &ChatLine::item(ChatLineModel::ColumnType column) {
   }
 }
 
-qreal ChatLine::setGeometry(qreal width) {
-  if(width != _width)
+// NOTE: senderPos is in ChatLines coordinate system!
+void ChatLine::setFirstColumn(const qreal &timestampWidth, const qreal &senderWidth, const QPointF &senderPos) {
+  _timestampItem.prepareGeometryChange();
+  _timestampItem.setGeometry(timestampWidth, _height);
+  // 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!
+void ChatLine::setSecondColumn(const qreal &senderWidth, const qreal &contentsWidth,
+			       const QPointF &contentsPos, qreal &linePos) {
+  // 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();
+
+  if(needGeometryChange) {
+    _timestampItem.prepareGeometryChange();
+    _senderItem.prepareGeometryChange();
+  }
+  _timestampItem.setHeight(height);
+  _senderItem.setGeometry(senderWidth, height);
+
+  _contentsItem.setPos(contentsPos);
+
+  _timestampItem.clearLayout();
+  _senderItem.clearLayout();
+
+  if(needGeometryChange)
     prepareGeometryChange();
 
-  ColumnHandleItem *firstColumnHandle = chatScene()->firstColumnHandle();
-  ColumnHandleItem *secondColumnHandle = chatScene()->secondColumnHandle();
-  _height = _contentsItem.setGeometry(width - secondColumnHandle->sceneRight());
-  _timestampItem.setGeometry(firstColumnHandle->sceneLeft(), _height);
-  _senderItem.setGeometry(secondColumnHandle->sceneLeft() - firstColumnHandle->sceneRight(), _height);
+  _height = height;
+
+  setPos(0, linePos);
+}
+
+void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth, qreal &linePos) {
+  qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
+  linePos -= height;
+  bool needGeometryChange = linePos == pos().y();
 
-  _senderItem.setPos(firstColumnHandle->sceneRight(), 0);
-  _contentsItem.setPos(secondColumnHandle->sceneRight(), 0);
+  if(needGeometryChange) {
+    _timestampItem.prepareGeometryChange();
+    _senderItem.prepareGeometryChange();
+  }
+  _timestampItem.setHeight(height);
+  _senderItem.setHeight(height);
+  _contentsItem.clearLayout();
+
+  if(needGeometryChange)
+    prepareGeometryChange();
 
+  _height = height;
   _width = width;
-  return _height;
+
+  setPos(0, linePos); // set pos is _very_ cheap if nothing changes.
 }
 
 void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) {
   if(selected) {
-    quint8 sel = (_selection & 0x80) | 0x40 | minColumn;
+    quint8 sel = (_selection & Highlighted) | Selected | minColumn;
     if(sel != _selection) {
       _selection = sel;
       for(int i = 0; i < minColumn; i++)
@@ -96,7 +142,7 @@ void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) {
       update();
     }
   } else {
-    quint8 sel = _selection & 0x80;
+    quint8 sel = _selection & Highlighted;
     if(sel != _selection) {
       _selection = sel;
       for(int i = 0; i <= ChatLineModel::ContentsColumn; i++)
@@ -107,8 +153,8 @@ void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) {
 }
 
 void ChatLine::setHighlighted(bool highlighted) {
-  if(highlighted) _selection |= 0x80;
-  else _selection &= 0x7f;
+  if(highlighted) _selection |= Highlighted;
+  else _selection &= ~Highlighted;
   update();
 }
 
@@ -119,23 +165,26 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     painter->fillRect(boundingRect(), QBrush(QtUi::style()->highlightColor()));
   }
   if(_selection & Selected) {
-    qreal left = item((ChatLineModel::ColumnType)(_selection & 0x3f)).x();
+    qreal left = item((ChatLineModel::ColumnType)(_selection & ItemMask)).x();
     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) {
+  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()->lastSeenMsgId(bufferId);
+      if(lastSeenMsgId < myMsgId && lastSeenMsgId >= prevMsgId) {
 	QtUiStyleSettings s("Colors");
-	QLinearGradient gradient(0, 0, 0, height());
+	QLinearGradient gradient(0, 0, 0, contentsItem().fontMetrics()->lineSpacing());
 	gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value<QColor>());
 	gradient.setColorAt(0.1, Qt::transparent);
 	painter->fillRect(boundingRect(), gradient);