YAY! Colors are back!

First version of ChatView to actually display formats, albeit layouting and
wrapping still needs a lot of love. But at least we have something that looks
colorful and shiny again... :)

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 6bf77a4..c12d5c5 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -20,10 +20,8 @@
 
 #include <QFontMetrics>
 #include <QGraphicsSceneMouseEvent>
 
 #include <QFontMetrics>
 #include <QGraphicsSceneMouseEvent>

-#include <QTextCursor>
-#include <QTextDocument>
-
-#include <QtGui>
+#include <QPainter>
+#include <QTextLayout>

 
 #include "chatitem.h"
 #include "chatlinemodel.h"
 
 #include "chatitem.h"
 #include "chatlinemodel.h"


@@ -32,6 +30,8 @@
 ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) : QGraphicsItem(parent), _index(index_) {
   QFontMetricsF *metrics = QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
   _lineHeight = metrics->lineSpacing();
 ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) : QGraphicsItem(parent), _index(index_) {
   QFontMetricsF *metrics = QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
   _lineHeight = metrics->lineSpacing();

+  _lineLeading = metrics->leading();
+  _layout = 0;

 }
 
 ChatItem::~ChatItem() {
 }
 
 ChatItem::~ChatItem() {


@@ -46,20 +46,6 @@ QVariant ChatItem::data(int role) const {
   return _index.data(role);
 }
 
   return _index.data(role);
 }
 

-/*
-QRectF ChatItem::boundingRect() const {
-  return QRectF(0, 0, _width, _height);
-}
-*/
-
-void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
-  Q_UNUSED(option); Q_UNUSED(widget);
-
-  painter->drawText(boundingRect(), data(MessageModel::DisplayRole).toString());
-  painter->setPen(Qt::DotLine);
-  painter->drawRect(boundingRect());
-}
-

 int ChatItem::setWidth(int w) {
   if(w == _boundingRect.width()) return _boundingRect.height();
   int h = heightForWidth(w);
 int ChatItem::setWidth(int w) {
   if(w == _boundingRect.width()) return _boundingRect.height();
   int h = heightForWidth(w);


@@ -89,27 +75,52 @@ int ChatItem::heightForWidth(int width) {
   return lines * _lineHeight;
 }
 
   return lines * _lineHeight;
 }
 

-/*
-
-void ChatItem::setTextOption(const QTextOption &option) {
-  _textOption = option;
-  layout();
-}
-
-QTextOption ChatItem::textOption() const {
-  return _textOption;
+void ChatItem::layout() {
+  if(_layout) return;
+  _layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
+
+  // Convert format information into a FormatRange
+  QList<QTextLayout::FormatRange> formatRanges;
+  UiStyle::FormatList formatList = data(MessageModel::FormatRole).value<UiStyle::FormatList>();
+  QTextLayout::FormatRange range;
+  int i = 0;
+  for(i = 0; i < formatList.count(); i++) {
+    range.format = QtUi::style()->mergedFormat(formatList.at(i).second);
+    range.start = formatList.at(i).first;
+    if(i > 0) formatRanges.last().length = range.start - formatRanges.last().start;
+    formatRanges.append(range);
+  }
+  if(i > 0) formatRanges.last().length = _layout->text().length() - formatRanges.last().start;
+  _layout->setAdditionalFormats(formatRanges);
+
+  // Now layout
+  qreal h = 0;
+  _layout->beginLayout();
+  forever {
+    QTextLine line = _layout->createLine();
+    if (!line.isValid())
+      break;
+
+    line.setLineWidth(width());
+    h += _lineLeading;
+    line.setPosition(QPointF(0, h));
+    h += line.height();
+  }
+  _layout->endLayout();

 }
 
 }
 

-QString ChatItem::text() const {
-  return _layout.text();
+void ChatItem::clearLayout() {
+  delete _layout;
+  _layout = 0;

 }
 
 }
 

-void ChatItem::setText(const UiStyle::StyledText &text) {
-  _layout.setText(text.text);
-  _layout.setAdditionalFormats(text.formatList);
+void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
+  Q_UNUSED(option); Q_UNUSED(widget);

   layout();
   layout();

+  _layout->draw(painter, QPointF(0,0), QVector<QTextLayout::FormatRange>(), boundingRect());

 }
 
 }
 

+/*

 void ChatItem::layout() {
   if(!_layout.additionalFormats().count()) return; // no text set
   if(_width <= 0) return;
 void ChatItem::layout() {
   if(!_layout.additionalFormats().count()) return; // no text set
   if(_width <= 0) return;


@@ -165,6 +176,3 @@ void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) {
   } else QGraphicsTextItem::mouseMoveEvent(event);
 }
 */
   } else QGraphicsTextItem::mouseMoveEvent(event);
 }
 */

-
-
-

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index 55985a3..2731a0c 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -22,13 +22,13 @@
 #define CHATITEM_H_
 
 #include <QGraphicsItem>
 #define CHATITEM_H_
 
 #include <QGraphicsItem>

-#include <QTextLayout>
-#include <QTextOption>

 
 #include "chatline.h"
 #include "chatlinemodel.h"
 #include "uistyle.h"
 
 
 #include "chatline.h"
 #include "chatlinemodel.h"
 #include "uistyle.h"
 

+class QTextLayout;
+

 class ChatItem : public QGraphicsItem {
 
   public:
 class ChatItem : public QGraphicsItem {
 
   public:


@@ -40,6 +40,11 @@ class ChatItem : public QGraphicsItem {
     inline int row() const { return _index.isValid() ? _index.row() : 0; }
 
     inline virtual QRectF boundingRect() const { return _boundingRect; }
     inline int row() const { return _index.isValid() ? _index.row() : 0; }
 
     inline virtual QRectF boundingRect() const { return _boundingRect; }

+    inline qreal width() const { return _boundingRect.width(); }
+    inline qreal height() const { return _boundingRect.height(); }
+
+    inline bool haveLayout() const { return _layout != 0; }
+    void clearLayout();

     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;


@@ -58,12 +63,16 @@ class ChatItem : public QGraphicsItem {
 
   private:
     int heightForWidth(int width);
 
   private:
     int heightForWidth(int width);

+    void layout();

 
     int _lineHeight;
 
     int _lineHeight;

+    qreal _lineLeading;

     QRectF _boundingRect;
     //QTextLayout _layout;
     //QTextOption _textOption;
     QPersistentModelIndex _index;
     QRectF _boundingRect;
     //QTextLayout _layout;
     //QTextOption _textOption;
     QPersistentModelIndex _index;

+
+    QTextLayout *_layout;

 };
 
 #endif
 };
 
 #endif