ChatItem::fontMetrics() moved to ContentsChtatItem::fontMetrics()

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 495a97e..ac2558e 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -32,17 +32,13 @@
 #include "qtui.h"
 #include "qtuistyle.h"
 
 #include "qtui.h"
 #include "qtuistyle.h"
 

-ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, ChatLineModel::ColumnType col, QGraphicsItem *parent)
+ChatItem::ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent)

   : QGraphicsItem(parent),
     _data(0),
     _boundingRect(0, 0, width, height),
   : QGraphicsItem(parent),
     _data(0),
     _boundingRect(0, 0, width, height),

-    _fontMetrics(0),

     _selectionMode(NoSelection),
     _selectionStart(-1)
 {
     _selectionMode(NoSelection),
     _selectionStart(-1)
 {

-  const QAbstractItemModel *model_ = model();
-  QModelIndex index = model_->index(row(), col);
-  _fontMetrics = QtUi::style()->fontMetrics(model_->data(index, ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);

   setAcceptHoverEvents(true);
   setZValue(20);
   setPos(pos);
   setAcceptHoverEvents(true);
   setZValue(20);
   setPos(pos);


@@ -185,17 +181,21 @@ QList<QRectF> ChatItem::findWords(const QString &searchWord, Qt::CaseSensitivity
     searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive);
   }
 
     searchIdx = plainText.indexOf(searchWord, searchIdx + 1, caseSensitive);
   }
 

-  if(!hasLayout())
+  bool hadLayout = hasLayout();
+  if(!hadLayout)

     updateLayout();
 
   foreach(int idx, indexList) {
     QTextLine line = layout()->lineForTextPosition(idx);
     qreal x = line.cursorToX(idx);
     qreal width = line.cursorToX(idx + searchWord.count()) - x;
     updateLayout();
 
   foreach(int idx, indexList) {
     QTextLine line = layout()->lineForTextPosition(idx);
     qreal x = line.cursorToX(idx);
     qreal width = line.cursorToX(idx + searchWord.count()) - x;

-    qreal height = fontMetrics()->lineSpacing();
+    qreal height = line.height();

     qreal y = height * line.lineNumber();
     resultList << QRectF(x, y, width, height);
   }
     qreal y = height * line.lineNumber();
     resultList << QRectF(x, y, width, height);
   }

+
+  if(!hadLayout)
+    clearLayout();

   return resultList;
 }
 
   return resultList;
 }
 


@@ -250,8 +250,12 @@ void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 // ContentsChatItem
 // ************************************************************
 ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent)
 // ContentsChatItem
 // ************************************************************
 ContentsChatItem::ContentsChatItem(const qreal &width, const QPointF &pos, QGraphicsItem *parent)

-  : ChatItem(0, 0, pos, column(), parent)
+  : ChatItem(0, 0, pos, parent)

 {
 {

+  const QAbstractItemModel *model_ = model();
+  QModelIndex index = model_->index(row(), column());
+  _fontMetrics = QtUi::style()->fontMetrics(model_->data(index, ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
+

   setGeometryByWidth(width);
 }
 
   setGeometryByWidth(width);
 }
 

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index 587cc60..31fdd5e 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -34,7 +34,7 @@ struct ChatItemPrivate;
 
 class ChatItem : public QGraphicsItem {
 protected:
 
 class ChatItem : public QGraphicsItem {
 protected:

-  ChatItem(const qreal &width, const qreal &height, const QPointF &pos, ChatLineModel::ColumnType column, QGraphicsItem *parent);
+  ChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent);

   virtual ~ChatItem();
 
 public:
   virtual ~ChatItem();
 
 public:


@@ -43,7 +43,6 @@ public:
   virtual ChatLineModel::ColumnType column() const = 0;
   inline ChatScene *chatScene() const { return qobject_cast<ChatScene *>(scene()); }
 
   virtual ChatLineModel::ColumnType column() const = 0;
   inline ChatScene *chatScene() const { return qobject_cast<ChatScene *>(scene()); }
 

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

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


@@ -51,9 +50,9 @@ public:
   inline bool hasLayout() const { return (bool)_data; }
   QTextLayout *createLayout(QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft);
   virtual inline QTextLayout *createLayout() { return createLayout(QTextOption::WrapAnywhere); }
   inline bool hasLayout() const { return (bool)_data; }
   QTextLayout *createLayout(QTextOption::WrapMode, Qt::Alignment = Qt::AlignLeft);
   virtual inline QTextLayout *createLayout() { return createLayout(QTextOption::WrapAnywhere); }

+  virtual void updateLayout();

   void clearLayout();
 
   void clearLayout();
 

-  virtual void updateLayout();

   virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
   QVariant data(int role) const;
   virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
   QVariant data(int role) const;


@@ -94,7 +93,6 @@ private:
 
   ChatItemPrivate *_data;
   QRectF _boundingRect;
 
   ChatItemPrivate *_data;
   QRectF _boundingRect;

-  QFontMetricsF *_fontMetrics;

 
   enum SelectionMode { NoSelection, PartialSelection, FullSelection };
   SelectionMode _selectionMode;
 
   enum SelectionMode { NoSelection, PartialSelection, FullSelection };
   SelectionMode _selectionMode;


@@ -122,7 +120,7 @@ ChatItemPrivate *ChatItem::privateData() const { return _data; }
 //! A ChatItem for the timestamp column
 class TimestampChatItem : public ChatItem {
 public:
 //! A ChatItem for the timestamp column
 class TimestampChatItem : public ChatItem {
 public:

-  TimestampChatItem(const qreal &width, const qreal &height, QGraphicsItem *parent) : ChatItem(width, height, QPointF(0, 0), column(), parent) {}
+  TimestampChatItem(const qreal &width, const qreal &height, QGraphicsItem *parent) : ChatItem(width, height, QPointF(0, 0), parent) {}

   virtual inline ChatLineModel::ColumnType column() const { return ChatLineModel::TimestampColumn; }
 };
 
   virtual inline ChatLineModel::ColumnType column() const { return ChatLineModel::TimestampColumn; }
 };
 


@@ -132,7 +130,7 @@ public:
 //! A ChatItem for the sender column
 class SenderChatItem : public ChatItem {
 public:
 //! A ChatItem for the sender column
 class SenderChatItem : public ChatItem {
 public:

-  SenderChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent) : ChatItem(width, height, pos, column(), parent) {}
+  SenderChatItem(const qreal &width, const qreal &height, const QPointF &pos, QGraphicsItem *parent) : ChatItem(width, height, pos, parent) {}

   virtual inline ChatLineModel::ColumnType column() const { return ChatLineModel::SenderColumn; }
   virtual inline QTextLayout *createLayout() { return ChatItem::createLayout(QTextOption::WrapAnywhere, Qt::AlignRight); }
 };
   virtual inline ChatLineModel::ColumnType column() const { return ChatLineModel::SenderColumn; }
   virtual inline QTextLayout *createLayout() { return ChatItem::createLayout(QTextOption::WrapAnywhere, Qt::AlignRight); }
 };


@@ -175,6 +173,9 @@ private:
   qreal setGeometryByWidth(qreal w);
   friend class ChatLine;
   friend struct ContentsChatItemPrivate;
   qreal setGeometryByWidth(qreal w);
   friend class ChatLine;
   friend struct ContentsChatItemPrivate;

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

 };
 
 struct ContentsChatItem::Clickable {
 };
 
 struct ContentsChatItem::Clickable {


@@ -203,6 +204,9 @@ struct ContentsChatItemPrivate : ChatItemPrivate {
   ContentsChatItemPrivate(QTextLayout *l, const QList<ContentsChatItem::Clickable> &c) : ChatItemPrivate(l), clickables(c), hasDragged(false) {}
 };
 
   ContentsChatItemPrivate(QTextLayout *l, const QList<ContentsChatItem::Clickable> &c) : ChatItemPrivate(l), clickables(c), hasDragged(false) {}
 };
 

+//inlines regarding ContentsChatItemPrivate
+ContentsChatItemPrivate *ContentsChatItem::privateData() const { return (ContentsChatItemPrivate *)ChatItem::privateData(); }
+

 class ContentsChatItem::WrapColumnFinder {
 public:
   WrapColumnFinder(ChatItem *parent);
 class ContentsChatItem::WrapColumnFinder {
 public:
   WrapColumnFinder(ChatItem *parent);


@@ -230,6 +234,4 @@ private:
 const QAbstractItemModel *ChatItem::model() const { return static_cast<ChatLine *>(parentItem())->model(); }
 int ChatItem::row() const { return static_cast<ChatLine *>(parentItem())->row(); }
 
 const QAbstractItemModel *ChatItem::model() const { return static_cast<ChatLine *>(parentItem())->model(); }
 int ChatItem::row() const { return static_cast<ChatLine *>(parentItem())->row(); }
 

-ContentsChatItemPrivate *ContentsChatItem::privateData() const { return (ContentsChatItemPrivate *)privateData(); }
-

 #endif
 #endif