X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=6bf77a45ba53c0b0b7110e8f26fb2ea4cd836a3b;hp=a677e1056a0756c23b309b298606a457a49e5264;hb=2a7928256ace73ac40b89b8c327cf08815da882d;hpb=dbdca302fc349d0e3d46aa0d8091c08b2df28af5

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index a677e105..6bf77a45 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -26,11 +26,12 @@
 #include <QtGui>
 
 #include "chatitem.h"
+#include "chatlinemodel.h"
+#include "qtui.h"
 
 ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) : QGraphicsItem(parent), _index(index_) {
-  //if(_wrapMode == WordWrap) {
-  //  setFlags(QGraphicsItem::ItemClipsToShape, true);
-  //}
+  QFontMetricsF *metrics = QtUi::style()->fontMetrics(data(ChatLineModel::FormatRole).value<UiStyle::FormatList>().at(0).second);
+  _lineHeight = metrics->lineSpacing();
 }
 
 ChatItem::~ChatItem() {
@@ -39,30 +40,57 @@ ChatItem::~ChatItem() {
 
 QVariant ChatItem::data(int role) const {
   if(!_index.isValid()) {
-    qWarning() << "ChatItem::data(): Model index is invalid!";
+    qWarning() << "ChatItem::data(): Model index is invalid!" << _index;
     return QVariant();
   }
   return _index.data(role);
 }
 
+/*
 QRectF ChatItem::boundingRect() const {
-  return QRectF(0, 0, 500,20);
+  return QRectF(0, 0, _width, _height);
 }
+*/
 
 void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
   Q_UNUSED(option); Q_UNUSED(widget);
 
-  painter->drawRect(boundingRect());
   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);
+  _boundingRect.setWidth(w);
+  _boundingRect.setHeight(h);
+  return h;
+}
 
-/*
-void ChatItem::setWidth(int w) {
-  _width = w;
-  layout();
+int ChatItem::heightForWidth(int width) {
+  if(data(ChatLineModel::ColumnTypeRole).toUInt() != ChatLineModel::ContentsColumn)
+    return _lineHeight; // only contents can be multi-line
+
+  QVariantList wrapList = data(ChatLineModel::WrapListRole).toList();
+  int lines = 1;
+  int offset = 0;
+  for(int i = 0; i < wrapList.count(); i+=2) {
+    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();
+      else offset += width;
+    } else {
+      offset += width;
+    }
+    i-=2;
+  }
+  return lines * _lineHeight;
 }
 
+/*
+
 void ChatItem::setTextOption(const QTextOption &option) {
   _textOption = option;
   layout();