fix(chatform): mark message with triple click

Fixes qTox#5211. Only trigger on triple clicks that are caused by the same mouse button clicked successively.
ezavod · Jul 9, 2018 · 2cdff7e · 2cdff7e
1 parent 2a8ab03
commit 2cdff7e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp
@@ -197,8 +197,14 @@ void ChatLog::mousePressEvent(QMouseEvent* ev)
         clearSelection();
     }
 
-    // Counts only single clicks and first click of doule click
-    clickCount++;
+    if (lastClickButton == ev->button()) {
+        // Counts only single clicks and first click of doule click
+        clickCount++;
+    }
+    else {
+        clickCount = 1; // restarting counter
+        lastClickButton = ev->button();
+    }
     lastClickPos = ev->pos();
 
     // Triggers on odd click counts
@@ -477,8 +483,14 @@ void ChatLog::mouseDoubleClickEvent(QMouseEvent* ev)
         emit selectionChanged();
     }
 
-    // Counts the second click of double click
-    clickCount++;
+    if (lastClickButton == ev->button()) {
+        // Counts the second click of double click
+        clickCount++;
+    }
+    else {
+        clickCount = 1; // restarting counter
+        lastClickButton = ev->button();
+    }
     lastClickPos = ev->pos();
 
     // Triggers on even click counts

diff --git a/src/chatlog/chatlog.h b/src/chatlog/chatlog.h
@@ -154,6 +154,7 @@ private slots:
     AutoScrollDirection selectionScrollDir = NoDirection;
     int clickCount = 0;
     QPoint lastClickPos;
+    Qt::MouseButton lastClickButton;
 
     // worker vars
     int workerLastIndex = 0;