Fixed: the focusable CDockWidget would lose focus when another QWindow containing a CDockManager that contains a focusable CDockWidget gains focus

This commit is contained in:
wingsummer 2024-09-16 17:21:03 +08:00 committed by 潘翔
parent 979d76aa47
commit 147afda646

5
src/DockFocusController.cpp Normal file → Executable file
View File

@ -260,6 +260,7 @@ void CDockFocusController::onFocusWindowChanged(QWindow *focusWindow)
return;
}
if(DockWidget->dockManager() == d->DockManager)
d->updateDockWidgetFocus(DockWidget);
}
@ -301,6 +302,7 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
}
#endif
if(DockWidget->dockManager() == d->DockManager)
d->updateDockWidgetFocus(DockWidget);
}
@ -309,7 +311,7 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
void CDockFocusController::setDockWidgetTabFocused(CDockWidgetTab* Tab)
{
auto DockWidget = Tab->dockWidget();
if (DockWidget)
if (DockWidget && DockWidget->dockManager() == d->DockManager)
{
d->updateDockWidgetFocus(DockWidget);
}
@ -327,6 +329,7 @@ void CDockFocusController::clearDockWidgetFocus(CDockWidget* dockWidget)
//===========================================================================
void CDockFocusController::setDockWidgetFocused(CDockWidget* focusedNow)
{
if(focusedNow->dockManager() == d->DockManager)
d->updateDockWidgetFocus(focusedNow);
}