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

Change default implementation of window() to just return 0

Browse Source 
Instead move the traversal up to the ancestors to the bridge.
This simplifies the default implementation to just return 0

Change-Id: Ic3ec60851f378587f4a23363aec2039d0e8a08a1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Jan-Arve Saether 2011-11-24 15:33:29 +01:00 committed by Qt by Nokia
parent 84a9b009e7
commit 53e4dfec7b
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/accessible/qaccessible.cpp
View File

@ -1167,18 +1167,18 @@ QColor QAccessibleInterface::backgroundColor() const
For instance, QAccessibleWidget reimplements this and returns
the windowHandle() of the QWidget.
The default implementation returns the window() of the parent interface.
It is used on some platforms to be able to notify the AT client about
state changes.
The backend will traverse up all ancestors until it finds a window.
(This means that at least one interface among the ancestors should
return a valid QWindow pointer).
The default implementation of this returns 0.
\preliminary
*/
QWindow *QAccessibleInterface::window() const
{
QAccessibleInterface *par = parent();
QWindow *w = par ? par->window() : 0;
delete par;
return w;
return 0;
}
/*!

19
src/plugins/platforms/windows/qwindowsaccessibility.cpp
View File

@ -1285,13 +1285,28 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accSelection(VARIANT *pvarChil
return S_OK;
}
static QWindow *window_helper(const QAccessibleInterface *iface)
{
QWindow *window = iface->window();
if (!window) {
QAccessibleInterface *acc = iface->parent();
while (acc && !window) {
window = acc->window();
QAccessibleInterface *par = acc->parent();
delete acc;
acc = par;
}
}
return window;
}
HRESULT STDMETHODCALLTYPE QWindowsAccessible::GetWindow(HWND *phwnd)
{
*phwnd = 0;
if (!accessible->isValid())
return E_UNEXPECTED;
QWindow *window = accessible->window();
QWindow *window = window_helper(accessible);
if (!window)
return E_FAIL;
@ -1387,7 +1402,7 @@ void QWindowsAccessibility::notifyAccessibilityUpdate(QObject *o, int who, QAcce
// An event has to be associated with a window,
// so find the first parent that is a widget and that has a WId
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(o);
QWindow *window = iface->window();
QWindow *window = window_helper(iface);
if (!window) {
window = QGuiApplication::activeWindow();