Correctly render timestamp and sender as well

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

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index d32b3cc..73e1806 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -39,6 +39,7 @@ class ChatItem : public QGraphicsItem {
     inline const MessageModel *model() const { return _index.isValid() ? qobject_cast<const MessageModel *>(_index.model()) : 0; }
     inline int row() const { return _index.isValid() ? _index.row() : 0; }
 
     inline const MessageModel *model() const { return _index.isValid() ? qobject_cast<const MessageModel *>(_index.model()) : 0; }
     inline int row() const { return _index.isValid() ? _index.row() : 0; }
 

+    inline QFontMetricsF *fontMetrics() const { return _fontMetrics; }

     inline virtual QRectF boundingRect() const { return _boundingRect; }
     inline qreal width() const { return _boundingRect.width(); }
     inline qreal height() const { return _boundingRect.height(); }
     inline virtual QRectF boundingRect() const { return _boundingRect; }
     inline qreal width() const { return _boundingRect.width(); }
     inline qreal height() const { return _boundingRect.height(); }


@@ -49,31 +50,44 @@ class ChatItem : public QGraphicsItem {
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
     virtual QVariant data(int role) const;
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
     virtual QVariant data(int role) const;

-    //QString text() const;
-    //void setText(const UiStyle::StyledText &text);
-
-    //QTextOption textOption() const;
-    //void setTextOption(const QTextOption &option);

 
     // returns height
     int setWidth(int width);
 
     // returns height
     int setWidth(int width);

-    //virtual void layout();

 
   protected:
     //void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
 
   private:
     int heightForWidth(int width);
 
   protected:
     //void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
 
   private:
     int heightForWidth(int width);

-    void layout();
+    QTextLayout *createLayout(QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft);

 
 

-    int _lineHeight;
-    qreal _lineLeading;

     QRectF _boundingRect;
     QRectF _boundingRect;

-    //QTextLayout _layout;
-    //QTextOption _textOption;
+    QFontMetricsF *_fontMetrics;
+    quint8 _lines;

     QPersistentModelIndex _index;
 
     QTextLayout *_layout;
     QPersistentModelIndex _index;
 
     QTextLayout *_layout;

+    QList<quint16> _wrapPositions;
+
+    class WrapColumnFinder;
+};
+
+class ChatItem::WrapColumnFinder {
+  public:
+    WrapColumnFinder(ChatItem *parent);
+    ~WrapColumnFinder();
+
+    int nextWrapColumn();
+
+  private:
+    ChatItem *item;
+    QTextLayout *layout;
+    QTextLine line;
+    ChatLineModel::WrapList wrapList;
+    int wordidx;
+    int lastwrapcol;
+    qreal lastwrappos;
+    qreal w;

 };
 
 #endif
 };
 
 #endif