From c74675fde7e2082dce1a6e4c4281308b946c49d9 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Sun, 21 Sep 2008 14:07:11 +0200 Subject: [PATCH] ChatLine cleanup --- src/qtui/chatline.cpp | 49 +++++-------------------------------------- src/qtui/chatline.h | 28 +++++++++++++++---------- 2 files changed, 22 insertions(+), 55 deletions(-) diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index df218a51..db4149a2 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 ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, @@ -70,11 +54,6 @@ ChatLine::ChatLine(int row, QAbstractItemModel *model, 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 +100,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 +112,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 +123,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 +135,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)); } diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h index 13f45cec..dcf2e410 100644 --- a/src/qtui/chatline.h +++ b/src/qtui/chatline.h @@ -28,21 +28,23 @@ class ChatLine : public QGraphicsItem { public: -// ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent = 0); ChatLine(int row, QAbstractItemModel *model, const qreal &width, const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, const QPointF &senderPos, const QPointF &contentsPos, QGraphicsItem *parent = 0); - virtual QRectF boundingRect () const; + virtual inline QRectF boundingRect () const { return QRectF(0, 0, _width, _height); } inline int row() { return _row; } inline void setRow(int row) { _row = row; } + inline const QAbstractItemModel *model() const { return _model; } inline ChatScene *chatScene() const { return qobject_cast(scene()); } + inline qreal width() const { return _width; } inline qreal height() const { return _height; } + ChatItem &item(ChatLineModel::ColumnType); inline ChatItem ×tampItem() { return _timestampItem; } inline ChatItem &senderItem() { return _senderItem; } @@ -50,8 +52,11 @@ public: virtual void paint (QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - // returns height - qreal setGeometryByWidth(qreal width); + // setColumns and setGeometryByWidth both return height + qreal setColumns(const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, + const QPointF &senderPos, const QPointF &contentsPos); + qreal setGeometryByWidth(const qreal &width, const qreal &contentsWidth); + void setSelected(bool selected, ChatLineModel::ColumnType minColumn = ChatLineModel::ContentsColumn); void setHighlighted(bool highlighted); @@ -63,14 +68,15 @@ private: TimestampChatItem _timestampItem; qreal _width, _height; - enum { Selected = 0x40, Highlighted = 0x80 }; + enum { ItemMask = 0x3f, + Selected = 0x40, + Highlighted = 0x80 + }; + // _selection[1..0] ... Min Selected Column (See MessageModel::ColumnType) + // _selection[5..2] ... reserved for new column types + // _selection[6] ...... Selected + // _selection[7] ...... Highlighted quint8 _selection; // save space, so we put both the col and the flags into one byte - - // setColumns and setGeometryByWidth both return height - qreal setColumns(const qreal ×tampWidth, const qreal &senderWidth, const qreal &contentsWidth, - const QPointF &senderPos, const QPointF &contentsPos); - qreal setGeometryByWidth(const qreal &width, const qreal &contentsWidth); - friend class ChatScene; }; #endif -- 2.20.1