Adapt to Orca 47

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

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 1cac8f7a602bbe71e29c045f919e5dcbe1ff5db2..128140e2e4cdf88422676bae110b3371a44be9af 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -12,6 +12,9 @@
 #include "kitemlistview.h"
 #include "private/kitemlistsmoothscroller.h"
 
+#ifndef QT_NO_ACCESSIBILITY
+#include "accessibility/kitemlistviewaccessible.h"
+#endif
 #include <QApplication>
 #include <QFontMetrics>
 #include <QGraphicsScene>
@@ -195,6 +198,17 @@ void KItemListContainer::focusInEvent(QFocusEvent *event)
     KItemListView *view = m_controller->view();
     if (view) {
         QApplication::sendEvent(view, event);
+
+        // We need to set the focus to the view or accessibility software will only announce the container (which has no information available itself).
+        // For some reason actively setting the focus to the view needs to be delayed or the focus will immediately go back to this container.
+        QTimer::singleShot(0, this, [this, view]() {
+            if (!isAncestorOf(QApplication::focusWidget())) {
+                view->setFocus();
+            }
+#ifndef QT_NO_ACCESSIBILITY
+            static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(view))->setAccessibleFocusAndAnnounceAll();
+#endif
+        });
     }
 }
 
@@ -277,6 +291,9 @@ void KItemListContainer::updateScrollOffsetScrollBar()
     int maximum = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_verticalSmoothScroller;
+        if (smoothScroller->isAnimating()) {
+            return;
+        }
         scrollOffsetScrollBar = verticalScrollBar();
 
         // Don't scroll super fast when using a wheel mouse:
@@ -297,6 +314,9 @@ void KItemListContainer::updateScrollOffsetScrollBar()
         maximum = qMax(0, int(view->maximumScrollOffset() - view->size().height()));
     } else {
         smoothScroller = m_horizontalSmoothScroller;
+        if (smoothScroller->isAnimating()) {
+            return;
+        }
         scrollOffsetScrollBar = horizontalScrollBar();
         singleStep = view->itemSize().width();
         pageStep = view->size().width();
@@ -333,11 +353,17 @@ void KItemListContainer::updateItemOffsetScrollBar()
     int pageStep = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_horizontalSmoothScroller;
+        if (smoothScroller->isAnimating()) {
+            return;
+        }
         itemOffsetScrollBar = horizontalScrollBar();
         singleStep = view->size().width() / 10;
         pageStep = view->size().width();
     } else {
         smoothScroller = m_verticalSmoothScroller;
+        if (smoothScroller->isAnimating()) {
+            return;
+        }
         itemOffsetScrollBar = verticalScrollBar();
         singleStep = view->size().height() / 10;
         pageStep = view->size().height();
@@ -399,6 +425,11 @@ void KItemListContainer::updateSmoothScrollers(Qt::Orientation orientation)
         m_horizontalSmoothScroller->setPropertyName("scrollOffset");
         m_verticalSmoothScroller->setPropertyName("itemOffset");
     }
+
+    const bool isRightToLeft = m_controller->view()->layoutDirection() == Qt::RightToLeft;
+    QScrollBar *hScrollBar = horizontalScrollBar();
+    hScrollBar->setInvertedAppearance(isRightToLeft && orientation == Qt::Vertical);
+    hScrollBar->setInvertedControls(!isRightToLeft || orientation == Qt::Vertical);
 }
 
 void KItemListContainer::updateScrollOffsetScrollBarPolicy()