From e6914d46493e7b394d52ed90f31ac6dec3711842 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 30 Dec 2019 16:40:14 +0300 Subject: [PATCH] Don't activate wrong window after popup menu. --- ui/widgets/popup_menu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp index 17ecfb4..5032008 100644 --- a/ui/widgets/popup_menu.cpp +++ b/ui/widgets/popup_menu.cpp @@ -519,7 +519,8 @@ PopupMenu::~PopupMenu() { delete submenu; } if (const auto parent = parentWidget()) { - if (QApplication::focusWidget() != nullptr) { + if (QApplication::focusWidget() != nullptr + && Ui::InFocusChain(parent)) { ActivateWindowDelayed(parent); } }