X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=c1c98da62babd4f9711fd4846d4d8d7dfab82bc4;hp=f0772b315e126eb79bd9d61d52b9d16ede4ea2b4;hb=66c5feaf7c9f480f06dfb45df2cf54e44c8b487b;hpb=e88a5b5f44c84f3892c120b98e6a376032a32644

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index f0772b31..c1c98da6 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  *
@@ -68,43 +68,59 @@ ChatItem &ChatLine::item(ChatLineModel::ColumnType column) {
   }
 }
 
-// WARNING: setColumns should not be used without either:
-//  a) calling prepareGeometryChange() immediately before setColumns()
-//  b) calling Chatline::setPos() immediately afterwards
-//
-// NOTE: senderPos and contentsPos are in ChatLines coordinate system!
-qreal ChatLine::setColumns(const qreal &timestampWidth, const qreal &senderWidth, const qreal &contentsWidth,
-			   const QPointF &senderPos, const QPointF &contentsPos) {
-  prepareGeometryChange();
+// 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);
+}
+
+// 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);
-  _timestampItem.setGeometry(timestampWidth, height);
 
-  _senderItem.setPos(senderPos);
   _contentsItem.setPos(contentsPos);
 
-  _contentsItem.clearLayout();
-  _senderItem.clearLayout();
-  _timestampItem.clearLayout();
-
+  if(needGeometryChange)
+    prepareGeometryChange();
 
   _height = height;
 
-  return _height;
+  setPos(0, linePos);
 }
 
-// WARNING: setGeometryByWidth should not be used without either:
-//  a) calling prepareGeometryChange() immediately before setColumns()
-//  b) calling Chatline::setPos() immediately afterwards
-qreal ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth) {
-  prepareGeometryChange();
+void ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth, qreal &linePos) {
   qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
-  _timestampItem.setHeight(height);
-  _senderItem.setHeight(height);
-  _contentsItem.clearLayout();
-  _height = height;
-  _width = width;
-  return _height;
+  linePos -= height;
+  bool needGeometryChange = (height != _height || width != _width);
+
+  if(height != _height) {
+    _timestampItem.prepareGeometryChange();
+    _timestampItem.setHeight(height);
+    _senderItem.prepareGeometryChange();
+    _senderItem.setHeight(height);
+  }
+
+  if(needGeometryChange) {
+    prepareGeometryChange();
+    _height = height;
+    _width = width;
+  }
+
+  setPos(0, linePos); // set pos is _very_ cheap if nothing changes.
 }
 
 void ChatLine::setSelected(bool selected, ChatLineModel::ColumnType minColumn) {
@@ -138,30 +154,42 @@ void ChatLine::setHighlighted(bool highlighted) {
 void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
   Q_UNUSED(option);
   Q_UNUSED(widget);
-  if(_selection & Highlighted) {
-    painter->fillRect(boundingRect(), QBrush(QtUi::style()->highlightColor()));
+
+  const QAbstractItemModel *model_ = model();
+  QModelIndex myIdx = model_->index(row(), 0);
+  Message::Type type = (Message::Type)myIdx.data(MessageModel::TypeRole).toInt();
+  UiStyle::MessageLabel label = (UiStyle::MessageLabel)myIdx.data(ChatLineModel::MsgLabelRole).toInt();
+
+  QTextCharFormat msgFmt = QtUi::style()->format(UiStyle::formatType(type), label);
+  if(msgFmt.hasProperty(QTextFormat::BackgroundBrush)) {
+    painter->fillRect(boundingRect(), msgFmt.background());
   }
+
   if(_selection & Selected) {
-    qreal left = item((ChatLineModel::ColumnType)(_selection & ItemMask)).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
-  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 = 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 = model_->data(prevRowIdx, MessageModel::BufferIdRole).value<BufferId>();
-      if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) {
-	QtUiStyleSettings s("Colors");
-	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);
+      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);
       }
     }
   }