X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=dfb069eafeb656a671b6de324cdfba2a931e16e2;hp=0920f77e7ce873f15edb97d9c672c27ae9722d21;hb=fbb96765b7039d74a2adaa0d17ed61ee64505786;hpb=f9aad45f24ef4e0bdaf78240777edff6651abf80

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 0920f77e..dfb069ea 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -34,7 +34,7 @@ ChatItem::ChatItem(const QPersistentModelIndex &index_, QGraphicsItem *parent) :
 }
 
 ChatItem::~ChatItem() {
-
+  delete _layout;
 }
 
 QVariant ChatItem::data(int role) const {
@@ -60,9 +60,8 @@ int ChatItem::heightForWidth(int width) {
     return fontMetrics()->lineSpacing(); // only contents can be multi-line
 
   _lines = 1;
-  QTextLine line;
   WrapColumnFinder finder(this);
-  while(finder.nextWrapColumn(line) > 0) _lines++;
+  while(finder.nextWrapColumn() > 0) _lines++;
   return _lines * fontMetrics()->lineSpacing();
 }
 
@@ -79,25 +78,23 @@ ChatItem::WrapColumnFinder::~WrapColumnFinder() {
   delete layout;
 }
 
-int ChatItem::WrapColumnFinder::nextWrapColumn(QTextLine &line) {
+int ChatItem::WrapColumnFinder::nextWrapColumn() {
   while(wordidx < wrapList.count()) {
     w += wrapList.at(wordidx).width;
     if(w >= item->width()) {
-      if(lastwrapcol == wrapList.at(wordidx).start) {
+      if(lastwrapcol >= wrapList.at(wordidx).start) {
         // first word, and it doesn't fit
         if(!line.isValid()) {
-          layout = item->createLayout();
+          layout = item->createLayout(QTextOption::NoWrap);
           layout->beginLayout();
           line = layout->createLine();
           line.setLineWidth(item->width());
           layout->endLayout();
         }
-        int idx = line.xToCursor((line.textStart() ? 0 : lastwrappos) + item->width());
-        qreal x = line.cursorToX(idx);
-        idx += line.textStart();
-        w = w - x - wrapList.at(wordidx).width;
-        if(line.textStart()) lastwrappos += x;
-        else lastwrappos = x;
+        int idx = line.xToCursor(lastwrappos + item->width(), QTextLine::CursorOnCharacter);
+        qreal x = line.cursorToX(idx, QTextLine::Trailing);
+        w = w - wrapList.at(wordidx).width - (x - lastwrappos);
+        lastwrappos = x;
         lastwrapcol = idx;
         return idx;
       }
@@ -113,11 +110,11 @@ int ChatItem::WrapColumnFinder::nextWrapColumn(QTextLine &line) {
   return -1;
 }
 
-QTextLayout *ChatItem::createLayout() {
+QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode) {
   QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
 
   QTextOption option;
-  option.setWrapMode(QTextOption::WrapAnywhere);
+  option.setWrapMode(wrapMode);
   layout->setTextOption(option);
 
   QList<QTextLayout::FormatRange> formatRanges
@@ -127,7 +124,7 @@ QTextLayout *ChatItem::createLayout() {
 }
 
 void ChatItem::updateLayout() {
-  if(!haveLayout()) _layout = createLayout();
+  if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere);
 
   // Now layout
   ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
@@ -143,7 +140,7 @@ void ChatItem::updateLayout() {
     if (!line.isValid())
       break;
 
-    int col = finder.nextWrapColumn(line);
+    int col = finder.nextWrapColumn();
     line.setNumColumns(col >= 0 ? col - line.textStart() : _layout->text().length());
 
     h += fontMetrics()->leading();
@@ -173,52 +170,6 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
   }
 }
 
-
-/*
-void ChatItem::layout() {
-  if(!_layout.additionalFormats().count()) return; // no text set
-  if(_width <= 0) return;
-  prepareGeometryChange();
-  QFontMetrics metrics(_layout.additionalFormats()[0].format.font());
-  int leading = metrics.leading();
-  int height = 0;
-  _layout.setTextOption(textOption());
-  _layout.beginLayout();
-  while(1) {
-    QTextLine line = _layout.createLine();
-    if(!line.isValid()) break;
-    line.setLineWidth(_width);
-    if(textOption().wrapMode() != QTextOption::NoWrap && line.naturalTextWidth() > _width) {
-      // word did not fit, we need to wrap it in the middle
-      // this is a workaround for Qt failing to handle WrapAtWordBoundaryOrAnywhere correctly
-      QTextOption::WrapMode mode = textOption().wrapMode();
-      textOption().setWrapMode(QTextOption::WrapAnywhere);
-      _layout.setTextOption(textOption());
-      line.setLineWidth(_width);
-      textOption().setWrapMode(mode);
-      _layout.setTextOption(textOption());
-    }
-    height += leading;
-    line.setPosition(QPoint(0, height));
-    height += line.height();
-  }
-  _layout.endLayout();
-  update();
-}    QDateTime _timestamp;
-    MsgId _msgId;
-
-
-QRectF ChatItem::boundingRect() const {
-  return _layout.boundingRect();
-}
-
-void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
-  Q_UNUSED(option); Q_UNUSED(widget);
-  _layout.draw(painter, QPointF(0, 0));
-
-}
-*/
-
 /*
 void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) {
   qDebug() << (void*)this << "moving" << event->pos();