alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also consider parent windows when evaluating focus loss for dialog hide.

Browse Source
This commit is contained in:
Eike Hein 2014-04-30 19:14:55 +02:00
parent 000d49463b
commit 3ebbedead2
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plasmaquick/dialog.cpp
View File

@ -777,12 +777,30 @@ void Dialog::focusInEvent(QFocusEvent *ev)
void Dialog::focusOutEvent(QFocusEvent *ev)
{
const QWindow *focusWindow = QGuiApplication::focusWindow();
if (d->hideOnWindowDeactivate) {
bool parentHasFocus = false;
if (d->hideOnWindowDeactivate && !(focusWindow && focusWindow->isActive() && isAncestorOf(focusWindow))) {
qDebug() << "DIALOG: hiding dialog.";
setVisible(false);
QWindow *parentWindow = transientParent();
while (parentWindow) {
if (parentWindow->isActive()) {
parentHasFocus = true;
break;
}
parentWindow = parentWindow->transientParent();
}
const QWindow *focusWindow = QGuiApplication::focusWindow();
bool childHasFocus = (focusWindow && focusWindow->isActive() && isAncestorOf(focusWindow));
if (!parentHasFocus && !childHasFocus) {
qDebug() << "DIALOG: hiding dialog.";
setVisible(false);
}
}
QQuickWindow::focusOutEvent(ev);
}