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

Author: Wing-summer

src/DockFocusController.cpp

@@ -260,7 +260,8 @@ void CDockFocusController::onFocusWindowChanged(QWindow *focusWindow)
 		return;
 	}
 
-	d->updateDockWidgetFocus(DockWidget);
+    if(DockWidget->dockManager() == d->DockManager)
+        d->updateDockWidgetFocus(DockWidget);
 }
 
 
@@ -298,18 +299,19 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
     if (!DockWidget || DockWidget->tabWidget()->isHidden())
 	{
     	return;
-	}
+    }
 #endif
 
-	d->updateDockWidgetFocus(DockWidget);
+    if(DockWidget->dockManager() == d->DockManager)
+        d->updateDockWidgetFocus(DockWidget);
 }
 
 
 //===========================================================================
 void CDockFocusController::setDockWidgetTabFocused(CDockWidgetTab* Tab)
 {
 	auto DockWidget = Tab->dockWidget();
-	if (DockWidget)
+    if (DockWidget && DockWidget->dockManager() == d->DockManager)
 	{
 		d->updateDockWidgetFocus(DockWidget);
 	}
@@ -327,7 +329,8 @@ void CDockFocusController::clearDockWidgetFocus(CDockWidget* dockWidget)
 //===========================================================================
 void CDockFocusController::setDockWidgetFocused(CDockWidget* focusedNow)
 {
-	d->updateDockWidgetFocus(focusedNow);
+    if(focusedNow->dockManager() == d->DockManager)
+        d->updateDockWidgetFocus(focusedNow);
 }