From 93a04332eb477e013a417f383df496b9a333ca7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 31 Mar 2020 15:56:40 +0200 Subject: Move QtAccessibilitySupport into QtGui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-83255 Change-Id: Ibc1b38e77c3c90030a832c41f4de65c6c38bc91d Reviewed-by: Tor Arne Vestbø --- src/gui/CMakeLists.txt | 1 + src/gui/accessible/accessible.pri | 11 +-- src/gui/accessible/qaccessiblebridgeutils.cpp | 113 ++++++++++++++++++++++++++ src/gui/accessible/qaccessiblebridgeutils_p.h | 70 ++++++++++++++++ 4 files changed, 190 insertions(+), 5 deletions(-) create mode 100644 src/gui/accessible/qaccessiblebridgeutils.cpp create mode 100644 src/gui/accessible/qaccessiblebridgeutils_p.h (limited to 'src/gui') diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 61b961f568..80acf0b754 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -442,6 +442,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h + accessible/qaccessiblebridgeutils.cpp accessible/qaccessiblebridgeutils_p.h accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index 95132d69de..7a376d98a2 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -6,16 +6,17 @@ qtConfig(accessibility) { accessible/qaccessiblecache_p.h \ accessible/qaccessibleobject.h \ accessible/qaccessibleplugin.h \ - accessible/qplatformaccessibility.h + accessible/qplatformaccessibility.h \ + accessible/qaccessiblebridge.h \ + accessible/qaccessiblebridgeutils_p.h SOURCES += accessible/qaccessible.cpp \ accessible/qaccessiblecache.cpp \ accessible/qaccessibleobject.cpp \ accessible/qaccessibleplugin.cpp \ - accessible/qplatformaccessibility.cpp - - HEADERS += accessible/qaccessiblebridge.h - SOURCES += accessible/qaccessiblebridge.cpp + accessible/qplatformaccessibility.cpp \ + accessible/qaccessiblebridge.cpp \ + accessible/qaccessiblebridgeutils.cpp mac { OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm diff --git a/src/gui/accessible/qaccessiblebridgeutils.cpp b/src/gui/accessible/qaccessiblebridgeutils.cpp new file mode 100644 index 0000000000..a15b93e31e --- /dev/null +++ b/src/gui/accessible/qaccessiblebridgeutils.cpp @@ -0,0 +1,113 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "qaccessiblebridgeutils_p.h" +#include + +QT_BEGIN_NAMESPACE + +namespace QAccessibleBridgeUtils { + +static bool performAction(QAccessibleInterface *iface, const QString &actionName) +{ + if (QAccessibleActionInterface *actionIface = iface->actionInterface()) { + if (actionIface->actionNames().contains(actionName)) { + actionIface->doAction(actionName); + return true; + } + } + return false; +} + +QStringList effectiveActionNames(QAccessibleInterface *iface) +{ + QStringList actions; + if (QAccessibleActionInterface *actionIface = iface->actionInterface()) + actions = actionIface->actionNames(); + + if (iface->valueInterface()) { + if (!actions.contains(QAccessibleActionInterface::increaseAction())) + actions << QAccessibleActionInterface::increaseAction(); + if (!actions.contains(QAccessibleActionInterface::decreaseAction())) + actions << QAccessibleActionInterface::decreaseAction(); + } + return actions; +} + +bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName) +{ + if (!iface) + return false; + if (performAction(iface, actionName)) + return true; + if (actionName != QAccessibleActionInterface::increaseAction() + && actionName != QAccessibleActionInterface::decreaseAction()) + return false; + + QAccessibleValueInterface *valueIface = iface->valueInterface(); + if (!valueIface) + return false; + bool success; + const QVariant currentVariant = valueIface->currentValue(); + double stepSize = valueIface->minimumStepSize().toDouble(&success); + if (!success || qFuzzyIsNull(stepSize)) { + const double min = valueIface->minimumValue().toDouble(&success); + if (!success) + return false; + const double max = valueIface->maximumValue().toDouble(&success); + if (!success) + return false; + stepSize = (max - min) / 10; // this is pretty arbitrary, we just need to provide something + const int typ = currentVariant.userType(); + if (typ != QMetaType::Float && typ != QMetaType::Double) { + // currentValue is an integer. Round it up to ensure stepping in case it was below 1 + stepSize = qCeil(stepSize); + } + } + const double current = currentVariant.toDouble(&success); + if (!success) + return false; + if (actionName == QAccessibleActionInterface::decreaseAction()) + stepSize = -stepSize; + valueIface->setCurrentValue(current + stepSize); + return true; +} + +} //namespace + +QT_END_NAMESPACE diff --git a/src/gui/accessible/qaccessiblebridgeutils_p.h b/src/gui/accessible/qaccessiblebridgeutils_p.h new file mode 100644 index 0000000000..f34fcc5816 --- /dev/null +++ b/src/gui/accessible/qaccessiblebridgeutils_p.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QACCESSIBLEBRIDGEUTILS_H +#define QACCESSIBLEBRIDGEUTILS_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +#include +#include + +QT_REQUIRE_CONFIG(accessibility); + +QT_BEGIN_NAMESPACE + +namespace QAccessibleBridgeUtils { + Q_GUI_EXPORT QStringList effectiveActionNames(QAccessibleInterface *iface); + Q_GUI_EXPORT bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionName); +} + +QT_END_NAMESPACE + +#endif //QACCESSIBLEBRIDGEUTILS_H -- cgit v1.2.3