1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear specific QWindow::focusObject() on QWindowPrivate::clearFocusObject()

Browse Source 
The focusObject of a QWidgetWindow is the focusWidget() of the top level
widget, so when clearing the focus object of the window we should clear
focus of the same focusWidget, not the application-wide focus widget,
which may live in another window.

Change-Id: Ib9162418865c225e23aac7987e119b3b651983eb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Tor Arne Vestbø 2014-10-15 17:36:55 +02:00
parent 3ab4e869e2
commit 0f98d36ff6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/kernel/qwidgetwindow.cpp
View File

@ -73,8 +73,10 @@ public:
void clearFocusObject() void clearFocusObject()
{ {
if (QApplicationPrivate::focus_widget) Q_Q(QWidgetWindow);
QApplicationPrivate::focus_widget->clearFocus(); QWidget *widget = q->widget();
if (widget && widget->focusWidget())
widget->focusWidget()->clearFocus();
} }
}; };