X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=051151c5e3a5566e662670515c05094be9224417;hp=655d1fd3a09499e07816226e625d2fe34c8fba78;hb=c95e8cea9060b25fa5115d19090b51f03290adc5;hpb=298137f6626526961b6644cc1eb8b0ae3d60ae8d

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 655d1fd3..051151c5 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -60,11 +60,11 @@ QVariant ChatItem::data(int role) const {
   return model()->data(index, role);
 }
 
-qreal ChatItem::setWidth(qreal w) {
+qreal ChatItem::setGeometry(qreal w, qreal h) {
   if(w == _boundingRect.width()) return _boundingRect.height();
   prepareGeometryChange();
   _boundingRect.setWidth(w);
-  qreal h = computeHeight();
+  if(h < 0) h = computeHeight();
   _boundingRect.setHeight(h);
   if(haveLayout()) updateLayout();
   return h;
@@ -208,7 +208,7 @@ void ChatItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
     if(_selectionMode == NoSelection) {
       chatScene()->setSelectingItem(this);  // removes earlier selection if exists
       _selectionStart = _selectionEnd = posToCursor(event->pos());
-      _selectionMode = PartialSelection;
+      //_selectionMode = PartialSelection;
     } else {
       chatScene()->setSelectingItem(0);
       _selectionMode = NoSelection;
@@ -226,6 +226,8 @@ void ChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
       qint16 end = posToCursor(event->pos());
       if(end != _selectionEnd) {
         _selectionEnd = end;
+        if(_selectionStart != _selectionEnd) _selectionMode = PartialSelection;
+        else _selectionMode = NoSelection;
         update();
       }
     } else {
@@ -239,11 +241,11 @@ void ChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
-  if(_selectionMode != NoSelection && event->buttons() == Qt::LeftButton) {
+  if(_selectionMode != NoSelection && !event->buttons() & Qt::LeftButton) {
     _selectionEnd = posToCursor(event->pos());
     QString selection
         = data(MessageModel::DisplayRole).toString().mid(qMin(_selectionStart, _selectionEnd), qAbs(_selectionStart - _selectionEnd));
-    QApplication::clipboard()->setText(selection, QClipboard::Clipboard);  // TODO configure where selections should go
+    chatScene()->putToClipboard(selection);
     event->accept();
   } else {
     event->ignore();