diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-15 14:41:45 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-27 19:31:50 +0100 |
commit | 079aaa9b0754db9b7b2a97cb2ea22042c6f50738 (patch) | |
tree | a5e6f9d745114546cece44ef4540e98e2a5bc82b /src/plugins/accessible/shared/qqmlaccessible.cpp | |
parent | 245352fa45f4913716d23d98fa099097357beff1 (diff) |
Accessibility: Use factory function instead of plugin
[ChangeLog][QtQuick] Accessibility for Qt Quick is now included in the
qtquick library instead of being a separate plugin.
Change-Id: I26a7ed14b8a387662cea8f89218485be50033e34
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/plugins/accessible/shared/qqmlaccessible.cpp')
-rw-r--r-- | src/plugins/accessible/shared/qqmlaccessible.cpp | 224 |
1 files changed, 0 insertions, 224 deletions
diff --git a/src/plugins/accessible/shared/qqmlaccessible.cpp b/src/plugins/accessible/shared/qqmlaccessible.cpp deleted file mode 100644 index ecf4e56acf..0000000000 --- a/src/plugins/accessible/shared/qqmlaccessible.cpp +++ /dev/null @@ -1,224 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qnamespace.h> -#include "qqmlaccessible.h" - -#ifndef QT_NO_ACCESSIBILITY - -QT_BEGIN_NAMESPACE - -QQmlAccessible::QQmlAccessible(QObject *object) - :QAccessibleObject(object) -{ -} - -void *QQmlAccessible::interface_cast(QAccessible::InterfaceType t) -{ - if (t == QAccessible::ActionInterface) - return static_cast<QAccessibleActionInterface*>(this); - return QAccessibleObject::interface_cast(t); -} - -QQmlAccessible::~QQmlAccessible() -{ -} - -QAccessibleInterface *QQmlAccessible::childAt(int x, int y) const -{ - // Note that this function will disregard stacking order. - // (QAccessibleQuickView::childAt() does this correctly and more efficient) - - // If the item clips its children, we can return early if the coordinate is outside its rect - if (clipsChildren()) { - if (!rect().contains(x, y)) - return 0; - } - - for (int i = childCount() - 1; i >= 0; --i) { - QAccessibleInterface *childIface = child(i); - if (childIface && !childIface->state().invisible) { - if (childIface->rect().contains(x, y)) - return childIface; - } - } - return 0; -} - -QAccessible::State QQmlAccessible::state() const -{ - QAccessible::State state; - - //QRect viewRect(QPoint(0, 0), m_implementation->size()); - //QRect itemRect(m_item->scenePos().toPoint(), m_item->boundingRect().size().toSize()); - - QRect viewRect_ = viewRect(); - QRect itemRect = rect(); - - // qDebug() << "viewRect" << viewRect << "itemRect" << itemRect; - // error case: - if (viewRect_.isNull() || itemRect.isNull()) { - state.invisible = true; - } - - if (!viewRect_.intersects(itemRect)) { - state.offscreen = true; - // state.invisible = true; // no set at this point to ease development - } - - if (!object()->property("visible").toBool() || qFuzzyIsNull(object()->property("opacity").toDouble())) { - state.invisible = true; - } - - if ((role() == QAccessible::CheckBox || role() == QAccessible::RadioButton) && object()->property("checked").toBool()) { - state.checked = true; - } - - if (role() == QAccessible::EditableText) - state.focusable = true; - - //qDebug() << "state?" << m_item->property("state").toString() << m_item->property("status").toString() << m_item->property("visible").toString(); - - return state; -} - -QStringList QQmlAccessible::actionNames() const -{ - QStringList actions; - switch (role()) { - case QAccessible::PushButton: - actions << QAccessibleActionInterface::pressAction(); - break; - case QAccessible::RadioButton: - case QAccessible::CheckBox: - actions << QAccessibleActionInterface::toggleAction() - << QAccessibleActionInterface::pressAction(); - break; - case QAccessible::Slider: - case QAccessible::SpinBox: - case QAccessible::ScrollBar: - actions << QAccessibleActionInterface::increaseAction() - << QAccessibleActionInterface::decreaseAction(); - break; - default: - break; - } - return actions; -} - -void QQmlAccessible::doAction(const QString &actionName) -{ - // Look for and call the accessible[actionName]Action() function on the item. - // This allows for overriding the default action handling. - const QByteArray functionName = "accessible" + actionName.toLatin1() + "Action"; - if (object()->metaObject()->indexOfMethod(functionName + "()") != -1) { - QMetaObject::invokeMethod(object(), functionName); - return; - } - - // Role-specific default action handling follows. Items are expected to provide - // properties according to role conventions. These will then be read and/or updated - // by the accessibility system. - // Checkable roles : checked - // Value-based roles : (via the value interface: value, minimumValue, maximumValue), stepSize - switch (role()) { - case QAccessible::RadioButton: - case QAccessible::CheckBox: { - QVariant checked = object()->property("checked"); - if (checked.isValid()) { - if (actionName == QAccessibleActionInterface::toggleAction() || - actionName == QAccessibleActionInterface::pressAction()) { - - object()->setProperty("checked", QVariant(!checked.toBool())); - } - } - break; - } - case QAccessible::Slider: - case QAccessible::SpinBox: - case QAccessible::Dial: - case QAccessible::ScrollBar: { - if (actionName != QAccessibleActionInterface::increaseAction() && - actionName != QAccessibleActionInterface::decreaseAction()) - break; - - // Update the value using QAccessibleValueInterface, respecting - // the minimum and maximum value (if set). Also check for and - // use the "stepSize" property on the item - if (QAccessibleValueInterface *valueIface = valueInterface()) { - QVariant valueV = valueIface->currentValue(); - qreal newValue = valueV.toReal(); - - QVariant stepSizeV = object()->property("stepSize"); - qreal stepSize = stepSizeV.isValid() ? stepSizeV.toReal() : qreal(1.0); - if (actionName == QAccessibleActionInterface::increaseAction()) { - newValue += stepSize; - } else { - newValue -= stepSize; - } - - QVariant minimumValueV = valueIface->minimumValue(); - if (minimumValueV.isValid()) { - newValue = qMax(newValue, minimumValueV.toReal()); - } - QVariant maximumValueV = valueIface->maximumValue(); - if (maximumValueV.isValid()) { - newValue = qMin(newValue, maximumValueV.toReal()); - } - - valueIface->setCurrentValue(QVariant(newValue)); - } - break; - } - default: - break; - } -} - -QStringList QQmlAccessible::keyBindingsForAction(const QString &actionName) const -{ - Q_UNUSED(actionName) - return QStringList(); -} - -QT_END_NAMESPACE - -#endif // QT_NO_ACCESSIBILITY |