X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatitem.cpp;h=036a6e62b49cec2a401677ea7013ae22bb74fd3f;hb=5cb0dfcd0cb0d5ee49fc4ca0de6c0116134326a7;hp=d58c6bcf16d8ad24a1fcb63624ee73ed86a358bd;hpb=ba9de06a8634a30863d54001cb8f934746333d58;p=quassel.git

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index d58c6bcf..036a6e62 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;
@@ -204,7 +204,7 @@ void ChatItem::continueSelecting(const QPointF &pos) {
 }
 
 void ChatItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
-  if(event->buttons() & Qt::LeftButton) {
+  if(event->buttons() == Qt::LeftButton) {
     if(_selectionMode == NoSelection) {
       chatScene()->setSelectingItem(this);  // removes earlier selection if exists
       _selectionStart = _selectionEnd = posToCursor(event->pos());
@@ -221,20 +221,25 @@ void ChatItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ChatItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
-  if(contains(event->pos())) {
-    qint16 end = posToCursor(event->pos());
-    if(end != _selectionEnd) {
-      _selectionEnd = end;
-      update();
+  if(event->buttons() == Qt::LeftButton) {
+    if(contains(event->pos())) {
+      qint16 end = posToCursor(event->pos());
+      if(end != _selectionEnd) {
+        _selectionEnd = end;
+        update();
+      }
+    } else {
+      setFullSelection();
+      chatScene()->startGlobalSelection(this, event->pos());
     }
+    event->accept();
   } else {
-    setFullSelection();
-    chatScene()->startGlobalSelection(this, event->pos());
+    event->ignore();
   }
 }
 
 void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
-  if(_selectionMode != NoSelection) {
+  if(_selectionMode != NoSelection && !event->buttons() & Qt::LeftButton) {
     _selectionEnd = posToCursor(event->pos());
     QString selection
         = data(MessageModel::DisplayRole).toString().mid(qMin(_selectionStart, _selectionEnd), qAbs(_selectionStart - _selectionEnd));
@@ -248,7 +253,7 @@ void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 void ChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
   // FIXME dirty and fast hack to make http:// urls klickable
 
-  QRegExp regex("\\b((?:h|f)t{1,2}ps?://[^\\s]+)\\b");
+  QRegExp regex("\\b([hf]t{1,2}ps?://[^\\s]+)\\b");
   QString str = data(ChatLineModel::DisplayRole).toString();
   int idx = posToCursor(event->pos());
   int mi = 0;
@@ -259,23 +264,24 @@ void ChatItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
       QDesktopServices::openUrl(QUrl(regex.capturedTexts()[1]));
       break;
     }
+    mi += regex.matchedLength();
   } while(mi >= 0);
   event->accept();
 }
 
 void ChatItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) {
   //qDebug() << (void*)this << "entering";
-
+  event->ignore();
 }
 
 void ChatItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) {
   //qDebug() << (void*)this << "leaving";
-
+  event->ignore();
 }
 
 void ChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
   //qDebug() << (void*)this << event->pos();
-
+  event->ignore();
 }