Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / kitemviews / kitemlistviewaccessible.cpp

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 565c2151ec17c59fb50f4db0fb17763de524486c..0188408a7241b3e5fa0c6ca7a2268f320ed70ca7 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -27,12 +27,8 @@
 #include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 
 #include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 

-#include <QtGui/qaccessible2.h>
-#include <qgraphicsscene.h>
-#include <qgraphicsview.h>
-
-#include <KDebug>
-#include <QHash>
+#include <QGraphicsScene>
+#include <QGraphicsView>

 
 KItemListView* KItemListViewAccessible::view() const
 {
 
 KItemListView* KItemListViewAccessible::view() const
 {


@@ -40,42 +36,61 @@ KItemListView* KItemListViewAccessible::view() const
 }
 
 KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) :
 }
 
 KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) :

-    QAccessibleObjectEx(view_)
+    QAccessibleObject(view_)

 {
     Q_ASSERT(view());
 {
     Q_ASSERT(view());

+    m_cells.resize(childCount());

 }
 
 }
 

-void KItemListViewAccessible::modelReset()
+KItemListViewAccessible::~KItemListViewAccessible()

 {
 {

+    foreach (AccessibleIdWrapper idWrapper, 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<QAccessibleTableInterface*>(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
 {
 {
     return cell(columnCount() * row + column);
 }
 
 QAccessibleInterface* KItemListViewAccessible::caption() const
 {

-    return 0;
+    return nullptr;

 }
 
 QString KItemListViewAccessible::columnDescription(int) const
 }
 
 QString KItemListViewAccessible::columnDescription(int) const


@@ -109,7 +124,7 @@ int KItemListViewAccessible::rowCount() const
 
 int KItemListViewAccessible::selectedCellCount() const
 {
 
 int KItemListViewAccessible::selectedCellCount() const
 {

-    return view()->controller()->selectionManager()->selectedItems().size();
+    return view()->controller()->selectionManager()->selectedItems().count();

 }
 
 int KItemListViewAccessible::selectedColumnCount() const
 }
 
 int KItemListViewAccessible::selectedColumnCount() const


@@ -127,10 +142,12 @@ QString KItemListViewAccessible::rowDescription(int) const
     return QString();
 }
 
     return QString();
 }
 

-QList<QAccessibleTable2CellInterface*> KItemListViewAccessible::selectedCells() const
+QList<QAccessibleInterface*> KItemListViewAccessible::selectedCells() const

 {
 {

-    QList<QAccessibleTable2CellInterface*> cells;
-    Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) {
+    QList<QAccessibleInterface*> cells;
+    const auto items = view()->controller()->selectionManager()->selectedItems();
+    cells.reserve(items.count());
+    for (int index : items) {

         cells.append(cell(index));
     }
     return cells;
         cells.append(cell(index));
     }
     return cells;


@@ -148,7 +165,7 @@ QList<int> KItemListViewAccessible::selectedRows() const
 
 QAccessibleInterface* KItemListViewAccessible::summary() const
 {
 
 QAccessibleInterface* KItemListViewAccessible::summary() const
 {

-    return 0;
+    return nullptr;

 }
 
 bool KItemListViewAccessible::isColumnSelected(int) const
 }
 
 bool KItemListViewAccessible::isColumnSelected(int) const


@@ -181,42 +198,31 @@ bool KItemListViewAccessible::unselectColumn(int)
     return true;
 }
 
     return true;
 }
 

-QAccessible2::TableModelChange KItemListViewAccessible::modelChange() const
+void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent* /*event*/)
+{}
+
+QAccessible::Role KItemListViewAccessible::role() const

 {
 {

-    QAccessible2::TableModelChange change;
-    change.lastRow = rowCount();
-    change.lastColumn = columnCount();
-    return change;
+    return QAccessible::Table;

 }
 
 }
 

-QAccessible::Role KItemListViewAccessible::role(int child) const
+QAccessible::State KItemListViewAccessible::state() const

 {
 {

-    Q_ASSERT(child >= 0);
-
-    if (child > 0) {
-        return QAccessible::Cell;
-    } else {
-        return QAccessible::Table;
-    }
+    QAccessible::State s;
+    return s;

 }
 
 }
 

-QAccessible::State KItemListViewAccessible::state(int child) const
+QAccessibleInterface* KItemListViewAccessible::childAt(int x, int y) const

 {
 {

-    if (child) {
-        QAccessibleInterface* interface = 0;
-        navigate(Child, child, &interface);
-        if (interface) {
-            return interface->state(0);
-        }
-    }
-
-    return QAccessible::Normal | QAccessible::HasInvokeExtension;
+    const QPointF point = QPointF(x, y);
+    int itemIndex = view()->itemAt(view()->mapFromScene(point));
+    return child(itemIndex);

 }
 
 }
 

-int KItemListViewAccessible::childAt(int x, int y) const
+QAccessibleInterface* KItemListViewAccessible::parent() const

 {
 {

-    const QPointF point = QPointF(x,y);
-    return view()->itemAt(view()->mapFromScene(point));
+    // FIXME: return KItemListContainerAccessible here
+    return nullptr;

 }
 
 int KItemListViewAccessible::childCount() const
 }
 
 int KItemListViewAccessible::childCount() const


@@ -227,25 +233,23 @@ int KItemListViewAccessible::childCount() const
 int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const
 {
     const KItemListAccessibleCell* widget = static_cast<const KItemListAccessibleCell*>(interface);
 int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const
 {
     const KItemListAccessibleCell* widget = static_cast<const KItemListAccessibleCell*>(interface);

-    return widget->index() + 1;
+    return widget->index();

 }
 
 }
 

-QString KItemListViewAccessible::text(Text, int child) const
+QString KItemListViewAccessible::text(QAccessible::Text) const

 {
 {

-    Q_ASSERT(child == 0);

     return QString();
 }
 
     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();
     if (scene) {
     if (!view()->isVisible()) {
         return QRect();
     }
 
     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 {
         const QRect viewRect = view()->geometry().toRect();
         return viewRect.translated(origin);
     } else {


@@ -253,50 +257,20 @@ 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();
-}
-
-bool KItemListViewAccessible::doAction(int, int, const QVariantList&)
-{
-    return false;
-}
-
-#endif
-

 // Table Cell
 
 KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index) :
 // Table Cell
 
 KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index) :


@@ -306,6 +280,14 @@ KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index)
     Q_ASSERT(index >= 0 && index < view->model()->count());
 }
 
     Q_ASSERT(index >= 0 && index < view->model()->count());
 }
 

+void* KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type)
+{
+    if (type == QAccessible::TableCellInterface) {
+        return static_cast<QAccessibleTableCellInterface*>(this);
+    }
+    return nullptr;
+}
+

 int KItemListAccessibleCell::columnExtent() const
 {
     return 1;
 int KItemListAccessibleCell::columnExtent() const
 {
     return 1;


@@ -341,52 +323,39 @@ bool KItemListAccessibleCell::isSelected() const
     return m_view->controller()->selectionManager()->isSelected(m_index);
 }
 
     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;
 }
 
     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()) {
     if (isSelected()) {

-        state |= Selected;
+        state.selected = true;

     }
 
     }
 

+    state.focusable = true;

     if (m_view->controller()->selectionManager()->currentItem() == m_index) {
     if (m_view->controller()->selectionManager()->currentItem() == m_index) {

-        state |= Focused;
+        state.focused = true;

     }
 
     }
 

-    state |= Selectable;
-    state |= Focusable;
-

     if (m_view->controller()->selectionBehavior() == KItemListController::MultiSelection) {
     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)) {
     }
 
     if (m_view->model()->isExpandable(m_index)) {
         if (m_view->model()->isExpanded(m_index)) {

-            state |= Expanded;
+            state.expanded = true;

         } else {
         } else {

-            state |= Collapsed;
+            state.collapsed = true;

         }
     }
 
         }
     }
 


@@ -398,7 +367,7 @@ bool KItemListAccessibleCell::isExpandable() const
     return m_view->model()->isExpandable(m_index);
 }
 
     return m_view->model()->isExpandable(m_index);
 }
 

-QRect KItemListAccessibleCell::rect(int) const
+QRect KItemListAccessibleCell::rect() const

 {
     QRect rect = m_view->itemRect(m_index).toRect();
 
 {
     QRect rect = m_view->itemRect(m_index).toRect();
 


@@ -411,13 +380,9 @@ QRect KItemListAccessibleCell::rect(int) const
     return rect;
 }
 
     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) {
     switch (t) {

-    case QAccessible::Value:

     case QAccessible::Name: {
         const QHash<QByteArray, QVariant> data = m_view->model()->data(m_index);
         return data["text"].toString();
     case QAccessible::Name: {
         const QHash<QByteArray, QVariant> data = m_view->model()->data(m_index);
         return data["text"].toString();


@@ -430,9 +395,13 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const
     return QString();
 }
 
     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
 }
 
 bool KItemListAccessibleCell::isValid() const


@@ -440,9 +409,9 @@ bool KItemListAccessibleCell::isValid() const
     return m_view && (m_index >= 0) && (m_index < m_view->model()->count());
 }
 
     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
 }
 
 int KItemListAccessibleCell::childCount() const


@@ -452,47 +421,15 @@ int KItemListAccessibleCell::childCount() const
 
 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;
 }
 
     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;
 int KItemListAccessibleCell::index() const
 {
     return m_index;


@@ -500,12 +437,12 @@ int KItemListAccessibleCell::index() const
 
 QObject* KItemListAccessibleCell::object() const
 {
 
 QObject* KItemListAccessibleCell::object() const
 {

-    return 0;
+    return nullptr;

 }
 
 // Container Interface
 KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) :
 }
 
 // Container Interface
 KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) :

-    QAccessibleWidgetEx(container)
+    QAccessibleWidget(container)

 {
 }
 
 {
 }
 


@@ -521,20 +458,17 @@ int KItemListContainerAccessible::childCount() const
 int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child) const
 {
     if (child->object() == container()->controller()->view()) {
 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