mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 08:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: WindowManager::activateModalWidget: Check ApplicationModal only

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2023-12-24 17:35:22 +03:00
parent 4995cb3b3b
commit 108ba9764d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/form/tray/trayicon.cpp
View File

@ -757,7 +757,7 @@ void TrayIcon::onTrayActivatedByTrigger()
if (clickAction(DoubleClick)) {
m_trayTriggered = true;
QTimer::singleShot(QApplication::doubleClickInterval(), this,
[=] { onTrayActivatedByClick(clickType, /*checkTriggered=*/true); });
[=, this] { onTrayActivatedByClick(clickType, /*checkTriggered=*/true); });
} else {
onTrayActivatedByClick(clickType);
}

2
src/ui/manager/windowmanager.cpp
View File

@ -709,7 +709,7 @@ bool WindowManager::isAnyWindowOpen(quint32 codes) const
bool WindowManager::activateModalWidget()
{
auto w = QApplication::activeModalWidget();
if (w) {
if (w && w->windowModality() == Qt::ApplicationModal) {
WidgetWindow::showWidget(w);
return true;
}