Swiftdiff options
Diffstat (limited to 'Swift/QtUI/QtStatusWidget.cpp')
| -rw-r--r-- | Swift/QtUI/QtStatusWidget.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/QtStatusWidget.cpp b/Swift/QtUI/QtStatusWidget.cpp index a5eda8b..e909f5c 100644 --- a/Swift/QtUI/QtStatusWidget.cpp +++ b/Swift/QtUI/QtStatusWidget.cpp @@ -93,13 +93,16 @@ void QtStatusWidget::handleApplicationFocusChanged(QWidget* /*old*/, QWidget* no if (stack_->currentIndex() == 0) { return; } - if (now != menu_ && now != statusEdit_) { + if (!now || (now != menu_ && now != statusEdit_ && !now->isAncestorOf(statusEdit_) && !now->isAncestorOf(menu_) && !statusEdit_->isAncestorOf(now) && !menu_->isAncestorOf(now))) { handleEditCancelled(); } + } void QtStatusWidget::mousePressEvent(QMouseEvent*) { - handleClicked(); + if (stack_->currentIndex() == 0) { + handleClicked(); + } } void QtStatusWidget::generateList() { |