X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/980846ab36eef12c152aa913267145b8bab2f326..b1f9c2e5c90548f391477fa17889ff8d1abf8f53:/src/kitemviews/kitemlistviewaccessible.cpp diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index d9ddd58f8..a8d80ab52 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -1,24 +1,10 @@ -/*************************************************************************** - * Copyright (C) 2012 by Amandeep Singh * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2012 Amandeep Singh + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #ifndef QT_NO_ACCESSIBILITY - #include "kitemlistviewaccessible.h" #include "kitemlistcontainer.h" @@ -27,55 +13,72 @@ #include "kitemlistview.h" #include "private/kitemlistviewlayouter.h" -#include -#include -#include - -#include -#include +#include +#include -KItemListView* KItemListViewAccessible::view() const +KItemListView *KItemListViewAccessible::view() const { - return qobject_cast(object()); + return qobject_cast(object()); } -KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) : - QAccessibleObjectEx(view_) +KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_, KItemListContainerAccessible *parent) + : QAccessibleObject(view_) + , m_parent(parent) { Q_ASSERT(view()); + Q_CHECK_PTR(parent); + m_cells.resize(childCount()); } -void KItemListViewAccessible::modelReset() +KItemListViewAccessible::~KItemListViewAccessible() { + for (AccessibleIdWrapper idWrapper : std::as_const(m_cells)) { + if (idWrapper.isValid) { + QAccessible::deleteAccessibleInterface(idWrapper.id); + } + } } -QAccessible::Role KItemListViewAccessible::cellRole() const +void *KItemListViewAccessible::interface_cast(QAccessible::InterfaceType type) { - return QAccessible::Cell; + if (type == QAccessible::TableInterface) { + return static_cast(this); + } + return nullptr; } -QAccessibleTable2CellInterface* KItemListViewAccessible::cell(int index) const +void KItemListViewAccessible::modelReset() { - if (index < 0 || index >= view()->model()->count()) { - return 0; - } else { - return new KItemListAccessibleCell(view(), index); - } } -QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList&) +QAccessibleInterface *KItemListViewAccessible::cell(int index) const { - return QVariant(); + if (index < 0 || index >= view()->model()->count()) { + return nullptr; + } + + if (m_cells.size() <= index) { + m_cells.resize(childCount()); + } + Q_ASSERT(index < m_cells.size()); + + AccessibleIdWrapper idWrapper = m_cells.at(index); + if (!idWrapper.isValid) { + idWrapper.id = QAccessible::registerAccessibleInterface(new KItemListAccessibleCell(view(), index)); + idWrapper.isValid = true; + m_cells.insert(index, idWrapper); + } + return QAccessible::accessibleInterface(idWrapper.id); } -QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const +QAccessibleInterface *KItemListViewAccessible::cellAt(int row, int column) const { return cell(columnCount() * row + column); } -QAccessibleInterface* KItemListViewAccessible::caption() const +QAccessibleInterface *KItemListViewAccessible::caption() const { - return 0; + return nullptr; } QString KItemListViewAccessible::columnDescription(int) const @@ -127,10 +130,12 @@ QString KItemListViewAccessible::rowDescription(int) const return QString(); } -QList KItemListViewAccessible::selectedCells() const +QList KItemListViewAccessible::selectedCells() const { - QList cells; - Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) { + QList cells; + const auto items = view()->controller()->selectionManager()->selectedItems(); + cells.reserve(items.count()); + for (int index : items) { cells.append(cell(index)); } return cells; @@ -146,9 +151,9 @@ QList KItemListViewAccessible::selectedRows() const return QList(); } -QAccessibleInterface* KItemListViewAccessible::summary() const +QAccessibleInterface *KItemListViewAccessible::summary() const { - return 0; + return nullptr; } bool KItemListViewAccessible::isColumnSelected(int) const @@ -181,42 +186,31 @@ bool KItemListViewAccessible::unselectColumn(int) return true; } -QAccessible2::TableModelChange KItemListViewAccessible::modelChange() const +void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent * /*event*/) { - QAccessible2::TableModelChange change; - change.lastRow = rowCount(); - change.lastColumn = columnCount(); - return change; } -QAccessible::Role KItemListViewAccessible::role(int child) const +QAccessible::Role KItemListViewAccessible::role() const { - Q_ASSERT(child >= 0); - - if (child > 0) { - return QAccessible::Cell; - } else { - return QAccessible::Table; - } + return QAccessible::Table; } -QAccessible::State KItemListViewAccessible::state(int child) const +QAccessible::State KItemListViewAccessible::state() const { - if (child) { - QAccessibleInterface* interface = 0; - navigate(Child, child, &interface); - if (interface) { - return interface->state(0); - } - } + QAccessible::State s; + return s; +} - return QAccessible::Normal | QAccessible::HasInvokeExtension; +QAccessibleInterface *KItemListViewAccessible::childAt(int x, int y) const +{ + const QPointF point = QPointF(x, y); + const std::optional itemIndex = view()->itemAt(view()->mapFromScene(point)); + return child(itemIndex.value_or(-1)); } -int KItemListViewAccessible::childAt(int x, int y) const +QAccessibleInterface *KItemListViewAccessible::parent() const { - const QPointF point = QPointF(x,y); - return view()->itemAt(view()->mapFromScene(point)); + return m_parent; } int KItemListViewAccessible::childCount() const @@ -224,28 +218,26 @@ int KItemListViewAccessible::childCount() const return view()->model()->count(); } -int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const +int KItemListViewAccessible::indexOfChild(const QAccessibleInterface *interface) const { - const KItemListAccessibleCell* widget = static_cast(interface); - return widget->index() + 1; + const KItemListAccessibleCell *widget = static_cast(interface); + return widget->index(); } -QString KItemListViewAccessible::text(Text, int child) const +QString KItemListViewAccessible::text(QAccessible::Text) const { - Q_ASSERT(child == 0); return QString(); } -QRect KItemListViewAccessible::rect(int child) const +QRect KItemListViewAccessible::rect() const { - Q_UNUSED(child) if (!view()->isVisible()) { return QRect(); } - const QGraphicsScene* scene = view()->scene(); + const QGraphicsScene *scene = view()->scene(); if (scene) { - const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0)); + const QPoint origin = scene->views().at(0)->mapToGlobal(QPoint(0, 0)); const QRect viewRect = view()->geometry().toRect(); return viewRect.translated(origin); } else { @@ -253,57 +245,35 @@ QRect KItemListViewAccessible::rect(int child) const } } -int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const +QAccessibleInterface *KItemListViewAccessible::child(int index) const { - *interface = 0; - - switch (relation) { - case QAccessible::Child: - Q_ASSERT(index > 0); - *interface = cell(index - 1); - if (*interface) { - return 0; - } - break; - - default: - break; + if (index >= 0 && index < childCount()) { + return cell(index); } - - return -1; + return nullptr; } -QAccessible::Relation KItemListViewAccessible::relationTo(int, const QAccessibleInterface*, int) const +KItemListViewAccessible::AccessibleIdWrapper::AccessibleIdWrapper() + : isValid(false) + , id(0) { - return QAccessible::Unrelated; } -#ifndef QT_NO_ACTION - -int KItemListViewAccessible::userActionCount(int) const -{ - return 0; -} - -QString KItemListViewAccessible::actionText(int, Text, int) const -{ - return QString(); -} +// Table Cell -bool KItemListViewAccessible::doAction(int, int, const QVariantList&) +KItemListAccessibleCell::KItemListAccessibleCell(KItemListView *view, int index) + : m_view(view) + , m_index(index) { - return false; + Q_ASSERT(index >= 0 && index < view->model()->count()); } -#endif - -// Table Cell - -KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index) : - m_view(view), - m_index(index) +void *KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type) { - Q_ASSERT(index >= 0 && index < view->model()->count()); + if (type == QAccessible::TableCellInterface) { + return static_cast(this); + } + return nullptr; } int KItemListAccessibleCell::columnExtent() const @@ -316,14 +286,14 @@ int KItemListAccessibleCell::rowExtent() const return 1; } -QList KItemListAccessibleCell::rowHeaderCells() const +QList KItemListAccessibleCell::rowHeaderCells() const { - return QList(); + return QList(); } -QList KItemListAccessibleCell::columnHeaderCells() const +QList KItemListAccessibleCell::columnHeaderCells() const { - return QList(); + return QList(); } int KItemListAccessibleCell::columnIndex() const @@ -341,52 +311,39 @@ bool KItemListAccessibleCell::isSelected() const return m_view->controller()->selectionManager()->isSelected(m_index); } -void KItemListAccessibleCell::rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const -{ - const KItemListViewLayouter* layouter = m_view->m_layouter; - *row = layouter->itemRow(m_index); - *column = layouter->itemColumn(m_index); - *rowExtents = 1; - *columnExtents = 1; - *selected = isSelected(); -} - -QAccessibleTable2Interface* KItemListAccessibleCell::table() const +QAccessibleInterface *KItemListAccessibleCell::table() const { - return QAccessible::queryAccessibleInterface(m_view)->table2Interface(); + return QAccessible::queryAccessibleInterface(m_view); } -QAccessible::Role KItemListAccessibleCell::role(int child) const +QAccessible::Role KItemListAccessibleCell::role() const { - Q_ASSERT(child == 0); return QAccessible::Cell; } -QAccessible::State KItemListAccessibleCell::state(int child) const +QAccessible::State KItemListAccessibleCell::state() const { - Q_ASSERT(child == 0); - QAccessible::State state = Normal; + QAccessible::State state; + state.selectable = true; if (isSelected()) { - state |= Selected; + state.selected = true; } + state.focusable = true; if (m_view->controller()->selectionManager()->currentItem() == m_index) { - state |= Focused; + state.focused = true; } - state |= Selectable; - state |= Focusable; - if (m_view->controller()->selectionBehavior() == KItemListController::MultiSelection) { - state |= MultiSelectable; + state.multiSelectable = true; } if (m_view->model()->isExpandable(m_index)) { if (m_view->model()->isExpanded(m_index)) { - state |= Expanded; + state.expanded = true; } else { - state |= Collapsed; + state.collapsed = true; } } @@ -398,7 +355,7 @@ bool KItemListAccessibleCell::isExpandable() const return m_view->model()->isExpandable(m_index); } -QRect KItemListAccessibleCell::rect(int) const +QRect KItemListAccessibleCell::rect() const { QRect rect = m_view->itemRect(m_index).toRect(); @@ -411,13 +368,9 @@ QRect KItemListAccessibleCell::rect(int) const return rect; } -QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const +QString KItemListAccessibleCell::text(QAccessible::Text t) const { - Q_ASSERT(child == 0); - Q_UNUSED(child) - switch (t) { - case QAccessible::Value: case QAccessible::Name: { const QHash data = m_view->model()->data(m_index); return data["text"].toString(); @@ -430,9 +383,13 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const return QString(); } -void KItemListAccessibleCell::setText(QAccessible::Text, int child, const QString&) +void KItemListAccessibleCell::setText(QAccessible::Text, const QString &) +{ +} + +QAccessibleInterface *KItemListAccessibleCell::child(int) const { - Q_ASSERT(child == 0); + return nullptr; } bool KItemListAccessibleCell::isValid() const @@ -440,9 +397,9 @@ bool KItemListAccessibleCell::isValid() const return m_view && (m_index >= 0) && (m_index < m_view->model()->count()); } -int KItemListAccessibleCell::childAt(int, int) const +QAccessibleInterface *KItemListAccessibleCell::childAt(int, int) const { - return 0; + return nullptr; } int KItemListAccessibleCell::childCount() const @@ -450,62 +407,30 @@ int KItemListAccessibleCell::childCount() const return 0; } -int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface* child) const +int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface *child) const { - Q_UNUSED(child); - return -1; -} - -int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const -{ - if (relation == Ancestor && index == 1) { - *interface = new KItemListViewAccessible(m_view); - return 0; - } - - *interface = 0; + Q_UNUSED(child) return -1; } -QAccessible::Relation KItemListAccessibleCell::relationTo(int child, const QAccessibleInterface* , int otherChild) const -{ - Q_ASSERT(child == 0); - Q_ASSERT(otherChild == 0); - return QAccessible::Unrelated; -} - -#ifndef QT_NO_ACTION - -int KItemListAccessibleCell::userActionCount(int) const -{ - return 0; -} - -QString KItemListAccessibleCell::actionText(int, Text, int) const -{ - return QString(); -} - -bool KItemListAccessibleCell::doAction(int, int, const QVariantList&) +QAccessibleInterface *KItemListAccessibleCell::parent() const { - return false; + return QAccessible::queryAccessibleInterface(m_view); } -#endif - int KItemListAccessibleCell::index() const { return m_index; } -QObject* KItemListAccessibleCell::object() const +QObject *KItemListAccessibleCell::object() const { - return 0; + return nullptr; } // Container Interface -KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) : - QAccessibleWidgetEx(container) +KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer *container) + : QAccessibleWidget(container) { } @@ -518,28 +443,25 @@ int KItemListContainerAccessible::childCount() const return 1; } -int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child) const +int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface *child) const { if (child->object() == container()->controller()->view()) { - return 1; - } else { - return -1; + return 0; } + return -1; } -int KItemListContainerAccessible::navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface** target) const +QAccessibleInterface *KItemListContainerAccessible::child(int index) const { - if (relation == QAccessible::Child) { - *target = new KItemListViewAccessible(container()->controller()->view()); - return 0; - } else { - return QAccessibleWidgetEx::navigate(relation, index, target); + if (index == 0) { + return QAccessible::queryAccessibleInterface(container()->controller()->view()); } + return nullptr; } -const KItemListContainer* KItemListContainerAccessible::container() const +const KItemListContainer *KItemListContainerAccessible::container() const { - return qobject_cast(object()); + return qobject_cast(object()); } #endif // QT_NO_ACCESSIBILITY