diff options
author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2011-12-20 13:20:13 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-22 00:47:03 +0100 |
commit | f0bf2b514911d24d8c3452d9146378c7ca509744 (patch) | |
tree | 71d2fe863037e394150d16799b465c1a69eb88aa /util | |
parent | f718728567568454cecaa9810b1f2c029a002fd7 (diff) |
Fix up the accessibility inspector.
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>
Diffstat (limited to 'util')
-rw-r--r-- | util/accessibilityinspector/accessibilityinspector.cpp | 4 | ||||
-rw-r--r-- | util/accessibilityinspector/screenreader.cpp | 26 |
2 files changed, 8 insertions, 22 deletions
diff --git a/util/accessibilityinspector/accessibilityinspector.cpp b/util/accessibilityinspector/accessibilityinspector.cpp index af7fd521e8..88008cd35b 100644 --- a/util/accessibilityinspector/accessibilityinspector.cpp +++ b/util/accessibilityinspector/accessibilityinspector.cpp @@ -106,14 +106,14 @@ void AccessibilityInspector::inspectWindow(QWindow *window) accessibilityView = new QGraphicsView(); accessibilityView->setScene(accessibilityScene); - accessibilityView->resize(1024, 768); + accessibilityView->resize(640, 480); accessibilityView->scale(1.3, 1.3); accessibilityTreeScene = new QGraphicsScene(); accessibilityTreeView = new QGraphicsView(); accessibilityTreeView->setScene(accessibilityTreeScene); - accessibilityTreeView->resize(1024, 768); + accessibilityTreeView->resize(640, 480); sceneManager = new AccessibilitySceneManager(); QObject::connect(optionsWidget, SIGNAL(optionsChanged()), sceneManager, SLOT(updateAccessibilitySceneItemFlags())); diff --git a/util/accessibilityinspector/screenreader.cpp b/util/accessibilityinspector/screenreader.cpp index aa17bfb6ee..5560743bc6 100644 --- a/util/accessibilityinspector/screenreader.cpp +++ b/util/accessibilityinspector/screenreader.cpp @@ -97,31 +97,17 @@ void ScreenReader::processTouchPoint() int hit = -2; int guardCounter = 0; const int guardMax = 40; - while (hit != 0) { + while (currentInterface != 0) { ++guardCounter; if (guardCounter > guardMax) { qDebug() << "touchPoint exit recursion overflow"; 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) - delete currentInterface; - currentInterface = childInterface; - } -*/ + + QAccessibleInterface * hit = currentInterface->childAt(m_currentTouchPoint.x(), m_currentTouchPoint.y()); + if (!hit) + break; + currentInterface = hit; } m_selectedInterface = currentInterface; |