mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Fixed stealing of focus by tab close button

Browse Source
This commit is contained in:
Uwe Kindler 2020-07-08 08:08:50 +02:00
parent 9974256d71
commit 50e3ef3dd8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DockFocusController.cpp
View File

@ -15,6 +15,7 @@
#include <QPointer> #include <QPointer>
#include <QApplication> #include <QApplication>
#include <QAbstractButton>
#include "DockWidget.h" #include "DockWidget.h"
#include "DockAreaWidget.h" #include "DockAreaWidget.h"
@ -217,15 +218,26 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
return; return;
} }
//qDebug() << "\n----------------------------"; //qDebug() << "\n----------------------------";
//qDebug() << "CDockFocusController::onApplicationFocusChanged " << " old: " << focusedOld << " new: " << focusedNow; //qDebug() << "CDockFocusController::onApplicationFocusChanged " << " old: " << focusedOld << " new: " << focusedNow;
Q_UNUSED(focusedOld)
if (!focusedNow) if (!focusedNow)
{ {
return; return;
} }
CDockWidget* DockWidget = nullptr; // If the close button in another tab steals the focus from the current
// active dock widget content, then we giv it back immediately
if (CDockManager::testConfigFlag(CDockManager::AllTabsHaveCloseButton))
{
auto OtherDockWidgetTab = internal::findParent<CDockWidgetTab*>(focusedNow);
if (OtherDockWidgetTab && focusedOld)
{
focusedOld->setFocus();
return;
}
}
CDockWidget* DockWidget = nullptr;
auto DockWidgetTab = qobject_cast<CDockWidgetTab*>(focusedNow); auto DockWidgetTab = qobject_cast<CDockWidgetTab*>(focusedNow);
if (DockWidgetTab) if (DockWidgetTab)
{ {