ChatLine cleanup

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

diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h
index 13f45ce..dcf2e41 100644 (file)
--- a/src/qtui/chatline.h
+++ b/src/qtui/chatline.h
@@ -28,21 +28,23 @@
 
 class ChatLine : public QGraphicsItem {
 public:
 
 class ChatLine : public QGraphicsItem {
 public:

-//   ChatLine(int row, QAbstractItemModel *model, QGraphicsItem *parent = 0);

   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 = 0);
 
   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 = 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 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<ChatScene *>(scene()); }
   inline const QAbstractItemModel *model() const { return _model; }
   inline ChatScene *chatScene() const { return qobject_cast<ChatScene *>(scene()); }

+

   inline qreal width() const { return _width; }
   inline qreal height() const { return _height; }
   inline qreal width() const { return _width; }
   inline qreal height() const { return _height; }

+

   ChatItem &item(ChatLineModel::ColumnType);
   inline ChatItem &timestampItem() { return _timestampItem; }
   inline ChatItem &senderItem() { return _senderItem; }
   ChatItem &item(ChatLineModel::ColumnType);
   inline ChatItem &timestampItem() { return _timestampItem; }
   inline ChatItem &senderItem() { return _senderItem; }


@@ -50,8 +52,11 @@ public:
 
   virtual void paint (QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
 
   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 &timestampWidth, 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);
 
   void setSelected(bool selected, ChatLineModel::ColumnType minColumn = ChatLineModel::ContentsColumn);
   void setHighlighted(bool highlighted);
 


@@ -63,14 +68,15 @@ private:
   TimestampChatItem _timestampItem;
   qreal _width, _height;
 
   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
   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 &timestampWidth, const qreal &senderWidth, const qreal &contentsWidth,
-                  const QPointF &senderPos, const QPointF &contentsPos);
-  qreal setGeometryByWidth(const qreal &width, const qreal &contentsWidth);
-  friend class ChatScene;

 };
 
 #endif
 };
 
 #endif