Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphintabbar.cpp

diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp
index e909c36aee923eeaba182d3184eb1eb97fe2fb8c..fc52afff6991ccb7a2b300b0097a0791771a76cd 100644 (file)
--- a/src/dolphintabbar.cpp
+++ b/src/dolphintabbar.cpp
@@ -19,17 +19,17 @@
 
 #include "dolphintabbar.h"
 
 
 #include "dolphintabbar.h"
 

-#include <QTimer>
-#include <QDragEnterEvent>

 #include <KLocalizedString>
 #include <KLocalizedString>

+
+#include <QDragEnterEvent>

 #include <QMenu>
 #include <QMenu>

-#include <QIcon>
-#include <QUrl>

 #include <QMimeData>
 #include <QMimeData>

+#include <QTimer>

 
 DolphinTabBar::DolphinTabBar(QWidget* parent) :
     QTabBar(parent),
 
 DolphinTabBar::DolphinTabBar(QWidget* parent) :
     QTabBar(parent),

-    m_autoActivationIndex(-1)
+    m_autoActivationIndex(-1),
+    m_tabToBeClosedOnMiddleMouseButtonRelease(-1)

 {
     setAcceptDrops(true);
     setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);
 {
     setAcceptDrops(true);
     setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);


@@ -95,12 +95,25 @@ void DolphinTabBar::mousePressEvent(QMouseEvent* event)
     const int index = tabAt(event->pos());
 
     if (index >= 0 && event->button() == Qt::MiddleButton) {
     const int index = tabAt(event->pos());
 
     if (index >= 0 && event->button() == Qt::MiddleButton) {

+        m_tabToBeClosedOnMiddleMouseButtonRelease = index;
+        return;
+    }
+
+    QTabBar::mousePressEvent(event);
+}
+
+void DolphinTabBar::mouseReleaseEvent(QMouseEvent *event)
+{
+    const int index = tabAt(event->pos());
+
+    if (index >= 0 && index == m_tabToBeClosedOnMiddleMouseButtonRelease
+        && event->button() == Qt::MiddleButton) {

         // Mouse middle click on a tab closes this tab.
         emit tabCloseRequested(index);
         return;
     }
 
         // Mouse middle click on a tab closes this tab.
         emit tabCloseRequested(index);
         return;
     }
 

-    QTabBar::mousePressEvent(event);
+    QTabBar::mouseReleaseEvent(event);

 }
 
 void DolphinTabBar::mouseDoubleClickEvent(QMouseEvent* event)
 }
 
 void DolphinTabBar::mouseDoubleClickEvent(QMouseEvent* event)