Another Speed boost for the new ChatView.

[quassel.git] / src / qtui / chatline.cpp

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 5213be8..df218a5 100644 (file)
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -27,19 +27,42 @@
 #include "client.h"
 #include "chatitem.h"
 #include "chatline.h"
+#include "columnhandleitem.h"
 #include "messagemodel.h"
 #include "networkmodel.h"
 #include "qtui.h"
 #include "qtuisettings.h"
+#include "qtuistyle.h"
 
-ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent)
+// ChatLine::ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent)
+//   : QGraphicsItem(parent),
+//     _row(row), // needs to be set before the items
+//     _model(model),
+//     _contentsItem(this),
+//     _senderItem(this),
+//     _timestampItem(this),
+//     _width(0),
+//     _height(0),
+//     _selection(0)
+// {
+//   Q_ASSERT(model);
+//   QModelIndex index = model->index(row, ChatLineModel::ContentsColumn);
+//   setHighlighted(model->data(index, MessageModel::FlagsRole).toInt() & Message::Highlight);
+// }
+
+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(ChatLineModel::TimestampColumn, model, this),
-    _senderItem(ChatLineModel::SenderColumn, model, this),
-    _contentsItem(ChatLineModel::ContentsColumn, 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);
@@ -65,18 +88,52 @@ ChatItem &ChatLine::item(ChatLineModel::ColumnType column) {
   }
 }
 
-qreal ChatLine::setGeometry(qreal width, qreal firstHandlePos, qreal secondHandlePos) {
+// 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) {
+  _height = _contentsItem.setGeometryByWidth(contentsWidth);
+  _senderItem.setGeometry(senderWidth, _height);
+  _timestampItem.setGeometry(timestampWidth, _height);
+
+  _senderItem.setPos(senderPos);
+  _contentsItem.setPos(contentsPos);
+
+  _contentsItem.clearLayout();
+  _senderItem.clearLayout();
+  _timestampItem.clearLayout();
+
+  return _height;
+}
+
+// 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) {
+  _width = width;
+  _height = _contentsItem.setGeometryByWidth(contentsWidth);
+  _timestampItem.setHeight(_height);
+  _senderItem.setHeight(_height);
+  _contentsItem.clearLayout();
+  return _height;
+}
+
+qreal ChatLine::setGeometryByWidth(qreal width) {
   if(width != _width)
     prepareGeometryChange();
-  qreal firstsep = QtUi::style()->firstColumnSeparator()/2;
-  qreal secondsep = QtUi::style()->secondColumnSeparator()/2;
 
-  _height = _contentsItem.setGeometry(width - secondHandlePos - secondsep);
-  _timestampItem.setGeometry(firstHandlePos - firstsep, _height);
-  _senderItem.setGeometry(secondHandlePos - firstHandlePos - (firstsep+secondsep), _height);
+  ColumnHandleItem *firstColumnHandle = chatScene()->firstColumnHandle();
+  ColumnHandleItem *secondColumnHandle = chatScene()->secondColumnHandle();
+
+  _height = _contentsItem.setGeometryByWidth(width - secondColumnHandle->sceneRight());
+  _timestampItem.setGeometry(firstColumnHandle->sceneLeft(), _height);
+  _senderItem.setGeometry(secondColumnHandle->sceneLeft() - firstColumnHandle->sceneRight(), _height);
 
-  _senderItem.setPos(firstHandlePos + firstsep, 0);
-  _contentsItem.setPos(secondHandlePos + secondsep, 0);
+  _senderItem.setPos(firstColumnHandle->sceneRight(), 0);
+  _contentsItem.setPos(secondColumnHandle->sceneRight(), 0);
 
   _width = width;
   return _height;
@@ -111,6 +168,8 @@ 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()));
   }
@@ -130,7 +189,7 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     if(!(flags & Message::Self)) {
       BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value<BufferId>();
       if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) {
-       QtUiSettings s("QtUiStyle/Colors");
+       QtUiStyleSettings s("Colors");
        QLinearGradient gradient(0, 0, 0, height());
        gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value<QColor>());
        gradient.setColorAt(0.1, Qt::transparent);