Also focus when clicking on the current tab

Fixes issue #71
KDAB · Sep 14, 2020 · 85cb289 · 85cb289
1 parent 5293943
commit 85cb289
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/private/widgets/TabBarWidget.cpp b/src/private/widgets/TabBarWidget.cpp
@@ -88,6 +88,12 @@ void TabBarWidget::mousePressEvent(QMouseEvent *e)
 {
     onMousePress(e->pos());
     QTabBar::mousePressEvent(e);
+
+    if ((Config::self().flags() & Config::Flag_TitleBarIsFocusable) && !frame()->isFocused()) {
+        // User clicked on a tab which was already focused
+        // A tab changing also counts as a change of scope
+        frame()->FocusScope::focus(Qt::MouseFocusReason);
+    }
 }
 
 void TabBarWidget::mouseMoveEvent(QMouseEvent *e)

diff --git a/src/private/widgets/TabWidget.cpp b/src/private/widgets/TabWidget.cpp
@@ -253,11 +253,5 @@ void TabWidget::onTabRemoved()
 
 void TabWidget::onCurrentTabChanged(int index)
 {
-    if (index < 0 || !(Config::self().flags() & Config::Flag_TitleBarIsFocusable) )
-        return;
-
-    // A tab changing also counts as a change of scope
-    if (!m_frame->isFocused()) {
-        m_frame->FocusScope::focus(Qt::MouseFocusReason);
-    }
+    Q_UNUSED(index);
 }
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
@@ -5884,9 +5884,7 @@ void TestDocks::tst_titleBarFocusedWhenTabsChange()
      QVERIFY(!dock2->titleBar()->isFocused());
 
      Tests::clickOn(globalPos, tabBar);
-     QEXPECT_FAIL("", "Fix pending", Continue);
      QVERIFY(!dock1->titleBar()->isFocused());
-     QEXPECT_FAIL("", "Fix pending", Continue);
      QVERIFY(dock2->titleBar()->isFocused());
 }