X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=6efe8c2a56187fad0dc81368800b764cfd7a906a;hp=568cdccf233c14bd0b86d125dfc67b790498bd6f;hb=2a5eaae0ee442dcae4076c161e788adf9e9d88c8;hpb=3a9668461efb05bd5b24ba5eb741a7f7f75086c9

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 568cdccf..6efe8c2a 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -20,10 +20,8 @@
 
 #include <QFontMetrics>
 #include <QGraphicsSceneMouseEvent>
-#include <QTextCursor>
-#include <QTextDocument>
-
-#include <QtGui>
+#include <QPainter>
+#include <QTextLayout>
 
 #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();
+  _lineLeading = metrics->leading();
+  _layout = 0;
 }
 
 ChatItem::~ChatItem() {
@@ -46,25 +46,13 @@ QVariant ChatItem::data(int role) const {
   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) {
+  w -= 10;
   if(w == _boundingRect.width()) return _boundingRect.height();
   int h = heightForWidth(w);
   _boundingRect.setWidth(w);
   _boundingRect.setHeight(h);
+  if(haveLayout()) updateLayout();
   return h;
 }
 
@@ -79,7 +67,7 @@ int ChatItem::heightForWidth(int width) {
     if(wrapList.at(i+1).toUInt() - offset < width) continue;
     lines++;
     if(i > 0) {
-      if(offset != wrapList.at(i-1).toUInt()) offset = wrapList.at(i-1).toUInt();
+      if(offset < wrapList.at(i-1).toUInt()) offset = wrapList.at(i-1).toUInt();
       else offset += width;
     } else {
       offset += width;
@@ -89,27 +77,58 @@ int ChatItem::heightForWidth(int width) {
   return lines * _lineHeight;
 }
 
-/*
-
-void ChatItem::setTextOption(const QTextOption &option) {
-  _textOption = option;
-  layout();
+void ChatItem::layout() {
+  if(haveLayout()) 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);
+  updateLayout();
 }
 
-QTextOption ChatItem::textOption() const {
-  return _textOption;
+void ChatItem::updateLayout() {
+  if(!haveLayout()) layout();
+
+  // 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->draw(painter, QPointF(0,0), QVector<QTextLayout::FormatRange>(), boundingRect());
+  painter->drawRect(boundingRect());
 }
 
+/*
 void ChatItem::layout() {
   if(!_layout.additionalFormats().count()) return; // no text set
   if(_width <= 0) return;
@@ -165,6 +184,3 @@ void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) {
   } else QGraphicsTextItem::mouseMoveEvent(event);
 }
 */
-
-
-