From a7fd8696dd303ab09328a916aa2a98e4d88db38d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 16 Apr 2013 15:26:38 +0200 Subject: Hide "invalid" accessibility interfaces. Those with a null object pointer and those with a null rect. Change-Id: I40e0c435ee768fc8c58098fec131eb65e89d76f2 Reviewed-by: Frederik Gladhorn --- .../accessibilityinspector/accessibilityscenemanager.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'util/accessibilityinspector/accessibilityscenemanager.cpp') diff --git a/util/accessibilityinspector/accessibilityscenemanager.cpp b/util/accessibilityinspector/accessibilityscenemanager.cpp index 80bc3f4ba8..6ecf30c163 100644 --- a/util/accessibilityinspector/accessibilityscenemanager.cpp +++ b/util/accessibilityinspector/accessibilityscenemanager.cpp @@ -253,9 +253,21 @@ void AccessibilitySceneManager::updateItemFlags(QGraphicsRectItem *item, QAccess } } + if (m_optionsWidget->hideNullObjectItems()) { + if (interface->object() == 0) { + shouldShow = false; + } + } + + if (m_optionsWidget->hideNullRectItems()) { + if (interface->rect().isNull()) { + shouldShow = false; + } + } + item->setVisible(shouldShow); - if (interface->object() == m_selectedObject) + if (interface->object() && interface->object() == m_selectedObject) item->setBrush(QColor(Qt::yellow)); else item->setBrush(QColor(Qt::white)); @@ -392,7 +404,7 @@ void AccessibilitySceneManager::addGraphicsItems(AccessibilitySceneManager::Tree graphicsItem->setRect(0, 0, m_treeItemWidth, m_treeItemHeight); graphicsItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape); - if (item.object == m_selectedObject) + if (item.object && item.object == m_selectedObject) graphicsItem->setBrush(QColor(Qt::yellow)); else graphicsItem->setBrush(QColor(Qt::white)); -- cgit v1.2.3