X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=f9495d13587f5582d8a997e6dd1184b1298fe1cc;hp=b5fb62ae204012bd93d0486543048799b3654290;hb=275c435910183d8a0755fd360a8a4e2a045cbca2;hpb=6aaf227185e89aacd23ff25e3d5ff5030ace3093

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index b5fb62ae..f9495d13 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -65,56 +65,12 @@ int ChatItem::heightForWidth(int width) {
   return _lines * fontMetrics()->lineSpacing();
 }
 
-ChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) : item(_item) {
-  wrapList = item->data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
-  wordidx = 0;
-  layout = 0;
-  lastwrapcol = 0;
-  lastwrappos = 0;
-  w = 0;
-}
-
-ChatItem::WrapColumnFinder::~WrapColumnFinder() {
-  delete layout;
-}
-
-int ChatItem::WrapColumnFinder::nextWrapColumn() {
-  while(wordidx < wrapList.count()) {
-    w += wrapList.at(wordidx).width;
-    if(w >= item->width()) {
-      if(lastwrapcol >= wrapList.at(wordidx).start) {
-        // first word, and it doesn't fit
-        if(!line.isValid()) {
-          layout = item->createLayout(QTextOption::NoWrap);
-          layout->beginLayout();
-          line = layout->createLine();
-          line.setLineWidth(item->width());
-          layout->endLayout();
-        }
-        int idx = line.xToCursor(lastwrappos + item->width());
-        qreal x = line.cursorToX(idx);
-        w = w - wrapList.at(wordidx).width - (x - lastwrappos);
-        lastwrappos = x;
-        lastwrapcol = idx;
-        return idx;
-      }
-      // not the first word, so just wrap before this
-      lastwrapcol = wrapList.at(wordidx).start;
-      lastwrappos = lastwrappos + w - wrapList.at(wordidx).width;
-      w = 0;
-      return lastwrapcol;
-    }
-    w += wrapList.at(wordidx).trailing;
-    wordidx++;
-  }
-  return -1;
-}
-
-QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode) {
+QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode, Qt::Alignment alignment) {
   QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
 
   QTextOption option;
   option.setWrapMode(wrapMode);
+  option.setAlignment(alignment);
   layout->setTextOption(option);
 
   QList<QTextLayout::FormatRange> formatRanges
@@ -124,30 +80,49 @@ QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode) {
 }
 
 void ChatItem::updateLayout() {
-  if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere);
-
-  // Now layout
-  ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
-  if(!wrapList.count()) return; // empty chatitem
-  int wordidx = 0;
-  ChatLineModel::Word word = wrapList.at(0);
-
-  qreal h = 0;
-  WrapColumnFinder finder(this);
-  _layout->beginLayout();
-  forever {
-    QTextLine line = _layout->createLine();
-    if (!line.isValid())
+  switch(data(ChatLineModel::ColumnTypeRole).toUInt()) {
+    case ChatLineModel::TimestampColumn:
+      if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere, Qt::AlignLeft);
+      // fallthrough
+    case ChatLineModel::SenderColumn:
+      if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere, Qt::AlignRight);
+      _layout->beginLayout();
+      {
+        QTextLine line = _layout->createLine();
+        if(line.isValid()) {
+          line.setLineWidth(width());
+        }
+        _layout->endLayout();
+      }
       break;
-
-    int col = finder.nextWrapColumn();
-    line.setNumColumns(col >= 0 ? col - line.textStart() : _layout->text().length());
-
-    h += fontMetrics()->leading();
-    line.setPosition(QPointF(0, h));
-    h += line.height();
+    case ChatLineModel::ContentsColumn: {
+      if(!haveLayout()) _layout = createLayout(QTextOption::WrapAnywhere);
+
+      // Now layout
+      ChatLineModel::WrapList wrapList = data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
+      if(!wrapList.count()) return; // empty chatitem
+      int wordidx = 0;
+      ChatLineModel::Word word = wrapList.at(0);
+
+      qreal h = 0;
+      WrapColumnFinder finder(this);
+      _layout->beginLayout();
+      forever {
+        QTextLine line = _layout->createLine();
+        if (!line.isValid())
+          break;
+
+        int col = finder.nextWrapColumn();
+        line.setNumColumns(col >= 0 ? col - line.textStart() : _layout->text().length());
+
+        h += fontMetrics()->leading();
+        line.setPosition(QPointF(0, h));
+        h += line.height();
+      }
+      _layout->endLayout();
+    }
+    break;
   }
-  _layout->endLayout();
 }
 
 void ChatItem::clearLayout() {
@@ -162,12 +137,7 @@ void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
   if(!haveLayout()) updateLayout();
   _layout->draw(painter, QPointF(0,0), QVector<QTextLayout::FormatRange>(), boundingRect());
   painter->drawRect(boundingRect());
-  int width = 0;
-  QVariantList wrapList = data(ChatLineModel::WrapListRole).toList();
-  for(int i = 2; i < wrapList.count(); i+=2) {
-    QRect r(wrapList[i-1].toUInt(), 0, wrapList[i+1].toUInt() - wrapList[i-1].toUInt(), fontMetrics()->lineSpacing());
-    painter->drawRect(r);
-  }
+
 }
 
 /*
@@ -181,3 +151,50 @@ void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) {
   } else QGraphicsTextItem::mouseMoveEvent(event);
 }
 */
+
+/*************************************************************************************************/
+
+ChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) : item(_item) {
+  wrapList = item->data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
+  wordidx = 0;
+  layout = 0;
+  lastwrapcol = 0;
+  lastwrappos = 0;
+  w = 0;
+}
+
+ChatItem::WrapColumnFinder::~WrapColumnFinder() {
+  delete layout;
+}
+
+int ChatItem::WrapColumnFinder::nextWrapColumn() {
+  while(wordidx < wrapList.count()) {
+    w += wrapList.at(wordidx).width;
+    if(w >= item->width()) {
+      if(lastwrapcol >= wrapList.at(wordidx).start) {
+        // first word, and it doesn't fit
+        if(!line.isValid()) {
+          layout = item->createLayout(QTextOption::NoWrap);
+          layout->beginLayout();
+          line = layout->createLine();
+          line.setLineWidth(item->width());
+          layout->endLayout();
+        }
+        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;
+      }
+      // not the first word, so just wrap before this
+      lastwrapcol = wrapList.at(wordidx).start;
+      lastwrappos = lastwrappos + w - wrapList.at(wordidx).width;
+      w = 0;
+      return lastwrapcol;
+    }
+    w += wrapList.at(wordidx).trailing;
+    wordidx++;
+  }
+  return -1;
+}