X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=00220bb91a0165d435c3196009c2c4914d6d140a;hp=df218a51ae9d9e73a1e9708a54bcaa29a0cdbb6f;hb=e178f81f44f5e305315f7755ca404c2a5f992711;hpb=176d22d49934223b9279719ac5d9e7c03e530d40

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index df218a51..00220bb9 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -34,22 +34,6 @@
 #include "qtuisettings.h"
 #include "qtuistyle.h"
 
-// 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,
@@ -67,14 +51,10 @@ ChatLine::ChatLine(int row, QAbstractItemModel *model,
 {
   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:
@@ -121,27 +101,9 @@ qreal ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidt
   return _height;
 }
 
-qreal ChatLine::setGeometryByWidth(qreal width) {
-  if(width != _width)
-    prepareGeometryChange();
-
-  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(firstColumnHandle->sceneRight(), 0);
-  _contentsItem.setPos(secondColumnHandle->sceneRight(), 0);
-
-  _width = width;
-  return _height;
-}
-
 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++)
@@ -151,7 +113,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++)
@@ -162,8 +124,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();
 }
 
@@ -174,7 +136,7 @@ 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));
   }
@@ -190,7 +152,7 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
       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, 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);