Remove unnecessary margin for ChatItems

[quassel.git] / src / qtui / chatitem.cpp

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index dfb069e..a3f3d30 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -46,7 +46,6 @@ QVariant ChatItem::data(int role) const {
 }
 
 int ChatItem::setWidth(int w) {
-  w -= 10;
   if(w == _boundingRect.width()) return _boundingRect.height();
   _boundingRect.setWidth(w);
   int h = heightForWidth(w);
@@ -65,6 +64,94 @@ int ChatItem::heightForWidth(int width) {
   return _lines * fontMetrics()->lineSpacing();
 }
 
+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
+         = QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value<UiStyle::FormatList>(), layout->text().length());
+  layout->setAdditionalFormats(formatRanges);
+  return layout;
+}
+
+void ChatItem::updateLayout() {
+  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());
+          line.setPosition(QPointF(0, fontMetrics()->leading()));
+        }
+        _layout->endLayout();
+      }
+      break;
+    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;
+  }
+}
+
+void ChatItem::clearLayout() {
+  delete _layout;
+  _layout = 0;
+}
+
+void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
+  Q_UNUSED(option); Q_UNUSED(widget);
+  if(!haveLayout()) updateLayout();
+  _layout->draw(painter, QPointF(0,0), QVector<QTextLayout::FormatRange>(), boundingRect());
+  //painter->drawRect(boundingRect());
+
+}
+
+/*
+void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) {
+  qDebug() << (void*)this << "moving" << event->pos();
+  if(event->pos().y() < 0) {
+    QTextCursor cursor(document());
+    //cursor.insertText("foo");
+    //cursor.select(QTextCursor::Document);
+    event->ignore();
+  } else QGraphicsTextItem::mouseMoveEvent(event);
+}
+*/
+
+/*************************************************************************************************/
+
 ChatItem::WrapColumnFinder::WrapColumnFinder(ChatItem *_item) : item(_item) {
   wrapList = item->data(ChatLineModel::WrapListRole).value<ChatLineModel::WrapList>();
   wordidx = 0;
@@ -109,75 +196,3 @@ int ChatItem::WrapColumnFinder::nextWrapColumn() {
   }
   return -1;
 }
-
-QTextLayout *ChatItem::createLayout(QTextOption::WrapMode wrapMode) {
-  QTextLayout *layout = new QTextLayout(data(MessageModel::DisplayRole).toString());
-
-  QTextOption option;
-  option.setWrapMode(wrapMode);
-  layout->setTextOption(option);
-
-  QList<QTextLayout::FormatRange> formatRanges
-         = QtUi::style()->toTextLayoutList(data(MessageModel::FormatRole).value<UiStyle::FormatList>(), layout->text().length());
-  layout->setAdditionalFormats(formatRanges);
-  return layout;
-}
-
-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())
-      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();
-}
-
-void ChatItem::clearLayout() {
-  delete _layout;
-  _layout = 0;
-}
-
-//int ChatItem::findNextWrapColumn(
-
-void ChatItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
-  Q_UNUSED(option); Q_UNUSED(widget);
-  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);
-  }
-}
-
-/*
-void ChatItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event ) {
-  qDebug() << (void*)this << "moving" << event->pos();
-  if(event->pos().y() < 0) {
-    QTextCursor cursor(document());
-    //cursor.insertText("foo");
-    //cursor.select(QTextCursor::Document);
-    event->ignore();
-  } else QGraphicsTextItem::mouseMoveEvent(event);
-}
-*/