AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add focusWindowChanged signal to QGuiApplication

Browse Source 
Required for Cocoa platform menus support, we need a
way to update state after focusWindow() result changes.

Change-Id: Idc573888c3d75bcbff2252e243c4b57b15fc2fcd
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
James Turner 2012-04-13 10:57:43 +01:00 committed by Qt by Nokia
parent 9487acb9d2
commit 617c026d65
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/kernel/qguiapplication.cpp
View File

@ -520,6 +520,13 @@ QWindow *QGuiApplication::focusWindow()
\sa focusObject() \sa focusObject()
*/ */
/*!
\fn QGuiApplication::focusWindowChanged(QWindow *focusWindow)
This signal is emitted when the focused window changes.
\sa focusWindow()
*/
/*! /*!
Returns the QObject in currently active window that will be final receiver of events Returns the QObject in currently active window that will be final receiver of events
tied to focus, such as key events. tied to focus, such as key events.
@ -1337,6 +1344,8 @@ void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate
if (previousFocusObject != qApp->focusObject()) if (previousFocusObject != qApp->focusObject())
self->q_updateFocusObject(qApp->focusObject()); self->q_updateFocusObject(qApp->focusObject());
} }
emit qApp->focusWindowChanged(newFocus);
} }
void QGuiApplicationPrivate::processWindowStateChangedEvent(QWindowSystemInterfacePrivate::WindowStateChangedEvent *wse) void QGuiApplicationPrivate::processWindowStateChangedEvent(QWindowSystemInterfacePrivate::WindowStateChangedEvent *wse)

1
src/gui/kernel/qguiapplication.h
View File

@ -148,6 +148,7 @@ Q_SIGNALS:
void screenAdded(QScreen *screen); void screenAdded(QScreen *screen);
void lastWindowClosed(); void lastWindowClosed();
void focusObjectChanged(QObject *focusObject); void focusObjectChanged(QObject *focusObject);
void focusWindowChanged(QWindow *focusWindow);
protected: protected:
bool event(QEvent *); bool event(QEvent *);