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

Windows QPA: Fix missing accessibility info with WebEngineView

Browse Source 
It seems when a WebEngineView is parented by a window its accessible
interface will not know its parent, which prevented the root of an
UI Automation fragment from being found, causing missing accessibility
info. This change adds a workaround to avoid this issue.

Task-number: QTBUG-70199
Change-Id: Ia7cfc9f410c4f0ef3b5f9d1700748a9a3e29b7c2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Andre de la Rocha 2018-08-30 18:11:31 +02:00
parent ff2a71e310
commit 20ac20bcea
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
View File

@ -57,11 +57,25 @@ QWindow *windowForAccessible(const QAccessibleInterface *accessible)
{ {
QWindow *window = accessible->window(); QWindow *window = accessible->window();
if (!window) { if (!window) {
QAccessibleInterface *acc = accessible->parent(); const QAccessibleInterface *acc = accessible;
while (acc && acc->isValid() && !window) { const QAccessibleInterface *par = accessible->parent();
window = acc->window(); while (par && par->isValid() && !window) {
QAccessibleInterface *par = acc->parent(); window = par->window();
acc = par; acc = par;
par = par->parent();
}
if (!window) {
// Workaround for WebEngineView not knowing its parent.
const auto appWindows = QGuiApplication::topLevelWindows();
for (QWindow *w : appWindows) {
if (QAccessibleInterface *root = w->accessibleRoot()) {
int count = root->childCount();
for (int i = 0; i < count; ++i) {
if (root->child(i) == acc)
return w;
}
}
}
} }
} }
return window; return window;