X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.h;h=20afe66fc09e7df11232a2cfb56e2e8438e8d374;hp=13f45cec1cdcb845ee8163829a7ff25c1f0014cd;hb=61e0633ce94a38e669382c29db498f335d2e0fa8;hpb=176d22d49934223b9279719ac5d9e7c03e530d40

diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h
index 13f45cec..20afe66f 100644
--- a/src/qtui/chatline.h
+++ b/src/qtui/chatline.h
@@ -25,33 +25,42 @@
 
 #include "chatlinemodel.h"
 #include "chatitem.h"
+#include "chatscene.h"
 
 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);
 
-  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<ChatScene *>(scene()); }
+
   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; }
   inline ContentsChatItem &contentsItem() { return _contentsItem; }
 
   virtual void paint (QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+  enum { Type = ChatScene::ChatLineType };
+  virtual inline int type() const { return Type; }
+
+  void setFirstColumn(const qreal &timestampWidth, const qreal &senderWidth, const QPointF &senderPos);
+  // setSecondColumn and setGeometryByWidth both also relocate the chatline.
+  // the _bottom_ position is passed via linePos. linePos is updated to the top of the chatLine.
+  void setSecondColumn(const qreal &senderWidth, const qreal &contentsWidth, const QPointF &contentsPos, qreal &linePos);
+  void setGeometryByWidth(const qreal &width, const qreal &contentsWidth, qreal &linePos);
 
-  // returns height
-  qreal setGeometryByWidth(qreal width);
   void setSelected(bool selected, ChatLineModel::ColumnType minColumn = ChatLineModel::ContentsColumn);
   void setHighlighted(bool highlighted);
 
@@ -63,14 +72,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 &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