Minor fixes to accessible interfaces

4 files changed, 10 insertions, 8 deletions

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 01a4cfd4e..7d7ccb4d8 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -23,6 +23,7 @@
 #include "kitemlistcontainer.h"
 
 #include "kitemlistcontroller.h"
+#include "kitemlistselectionmanager.h"
 #include "kitemlistview.h"
 #include "kitemmodelbase.h"
 
@@ -163,7 +164,6 @@ void KItemListContainer::keyPressEvent(QKeyEvent* event)
     if (view) {
         QApplication::sendEvent(view, event);
     }
-    //QAccessible::updateAccessibility(view, 0, QAccessible::Focus);
 }
 
 void KItemListContainer::showEvent(QShowEvent* event)
@@ -182,6 +182,7 @@ void KItemListContainer::scrollContentsBy(int dx, int dy)
 {
     m_horizontalSmoothScroller->scrollContentsBy(dx);
     m_verticalSmoothScroller->scrollContentsBy(dy);
+    //QAccessible::updateAccessibility(view(), , );
 }
 
 void KItemListContainer::wheelEvent(QWheelEvent* event)
@@ -369,6 +370,8 @@ void KItemListContainer::updateGeometries()
 
         updateScrollOffsetScrollBar();
         updateItemOffsetScrollBar();
+        QAccessible::updateAccessibility(m_controller->view(), 0, QAccessible::LocationChanged);
+        QAccessible::updateAccessibility(m_controller->view(), m_controller->selectionManager()->currentItem(), QAccessible::LocationChanged);
     }
 }
 
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 985663622..c8e0094b5 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -40,6 +40,7 @@
 #include <QGraphicsView>
 #include <QMimeData>
 #include <QTimer>
+#include <QAccessible>
 
 KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),
diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index 6e8e3d367..a88152622 100644
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -30,8 +30,6 @@
 #include <QPointF>
 #include <QSet>
 
-#include <QAccessible>
-
 class KItemModelBase;
 class KItemListKeyboardSearchManager;
 class KItemListSelectionManager;
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index de6e18e80..cb5097fad 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -71,7 +71,7 @@ QAccessibleInterface *KItemListViewAccessible::caption() const
 
 QString KItemListViewAccessible::columnDescription(int) const
 {
-    return QObject::tr("No Column Description");
+    return "";
 }
 
 int KItemListViewAccessible::columnCount() const
@@ -105,7 +105,7 @@ int KItemListViewAccessible::selectedRowCount() const
 
 QString KItemListViewAccessible::rowDescription(int) const
 {
-    return "No Row Description";
+    return "";
 }
 
 QList<QAccessibleTable2CellInterface*> KItemListViewAccessible::selectedCells() const
@@ -386,7 +386,7 @@ QAccessible::State KItemListAccessibleCell::state(int child) const
     //if (!globalRect.intersects(rect(0)))
     //    st |= Invisible;
 
-    if (view->controller()->selectionManager()->isSelected(index-1))
+    if (isSelected())
          st |= Selected;
     if (view->controller()->selectionManager()->currentItem() == index)
         st |= Focused;
@@ -435,8 +435,8 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const
     case QAccessible::Value:
     case QAccessible::Name:
         return data["text"].toString();
-    case QAccessible::Description:
-        return data["text"].toString() + " : " + data["group"].toString();
+    //case QAccessible::Description:
+        //return data["text"].toString() + " : " + data["group"].toString();
     default:
         break;
     }