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

Fix up the accessibility inspector.

Browse Source 
After accessibility API changes. Also make the windows
a bit smaller since the primary user is on a laptop
now.

Change-Id: I53a86cbe85adbbb27401dbf6c3c389629e295b4d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Morten Johan Sorvig 2011-12-20 13:20:13 +01:00 committed by Qt by Nokia
parent f718728567
commit f0bf2b5149
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/accessibilityinspector/accessibilityinspector.cpp
View File

@ -106,14 +106,14 @@ void AccessibilityInspector::inspectWindow(QWindow *window)
accessibilityView = new QGraphicsView(); accessibilityView = new QGraphicsView();
accessibilityView->setScene(accessibilityScene); accessibilityView->setScene(accessibilityScene);
accessibilityView->resize(1024, 768); accessibilityView->resize(640, 480);
accessibilityView->scale(1.3, 1.3); accessibilityView->scale(1.3, 1.3);
accessibilityTreeScene = new QGraphicsScene(); accessibilityTreeScene = new QGraphicsScene();
accessibilityTreeView = new QGraphicsView(); accessibilityTreeView = new QGraphicsView();
accessibilityTreeView->setScene(accessibilityTreeScene); accessibilityTreeView->setScene(accessibilityTreeScene);
accessibilityTreeView->resize(1024, 768); accessibilityTreeView->resize(640, 480);
sceneManager = new AccessibilitySceneManager(); sceneManager = new AccessibilitySceneManager();
QObject::connect(optionsWidget, SIGNAL(optionsChanged()), sceneManager, SLOT(updateAccessibilitySceneItemFlags())); QObject::connect(optionsWidget, SIGNAL(optionsChanged()), sceneManager, SLOT(updateAccessibilitySceneItemFlags()));

24
util/accessibilityinspector/screenreader.cpp
View File

@ -97,31 +97,17 @@ void ScreenReader::processTouchPoint()
int hit = -2; int hit = -2;
int guardCounter = 0; int guardCounter = 0;
const int guardMax = 40; const int guardMax = 40;
while (hit != 0) { while (currentInterface != 0) {
++guardCounter; ++guardCounter;
if (guardCounter > guardMax) { if (guardCounter > guardMax) {
qDebug() << "touchPoint exit recursion overflow"; qDebug() << "touchPoint exit recursion overflow";
return; // outside return; // outside
} }
/*
hit = currentInterface->childAt(m_currentTouchPoint.x(), m_currentTouchPoint.y());
//qDebug() << "hit" << hit;
if (hit == -1) {
return; // outside
} else if (hit == 0) {
break; // found it.
} else {
QAccessibleInterface *childInterface = 0;
int child = currentInterface->navigate(QAccessible::Child, hit, &childInterface);
if (childInterface == 0) {
return; // navigation error
}
if (currentInterface != m_rootInterface) QAccessibleInterface * hit = currentInterface->childAt(m_currentTouchPoint.x(), m_currentTouchPoint.y());
delete currentInterface; if (!hit)
currentInterface = childInterface; break;
} currentInterface = hit;
*/
} }
m_selectedInterface = currentInterface; m_selectedInterface = currentInterface;