kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Allow PopupMenu not to reactivate parent window.

Browse source
This commit is contained in:
John Preston 2020-11-30 14:13:54 +03:00
parent 79ea651127
commit 3a05cdc11e
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/widgets/popup_menu.cpp
View file

@ -538,7 +538,9 @@ PopupMenu::~PopupMenu() {
delete submenu; delete submenu;
} }
if (const auto parent = parentWidget()) { if (const auto parent = parentWidget()) {
if (QApplication::focusWidget() != nullptr const auto focused = QApplication::focusWidget();
if (_reactivateParent
&& focused != nullptr
&& Ui::InFocusChain(parent->window())) { && Ui::InFocusChain(parent->window())) {
ActivateWindowDelayed(parent); ActivateWindowDelayed(parent);
} }

4
ui/widgets/popup_menu.h
View file

@ -37,6 +37,9 @@ public:
void setDestroyedCallback(Fn<void()> callback) { void setDestroyedCallback(Fn<void()> callback) {
_destroyedCallback = std::move(callback); _destroyedCallback = std::move(callback);
} }
void discardParentReActivate() {
_reactivateParent = false;
}
~PopupMenu(); ~PopupMenu();
@ -122,6 +125,7 @@ private:
bool _deleteOnHide = true; bool _deleteOnHide = true;
bool _triggering = false; bool _triggering = false;
bool _deleteLater = false; bool _deleteLater = false;
bool _reactivateParent = true;
Fn<void()> _destroyedCallback; Fn<void()> _destroyedCallback;