GIT_SILENT Sync po/docbooks with svn

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

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index f253cda539dc03d2957516a07bedbbd6822c0323..3ec56e5f10c57da4423ac4ade5f79f0682b8d06e 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -12,6 +12,9 @@
 #include "kitemlistview.h"
 #include "private/kitemlistsmoothscroller.h"
 
 #include "kitemlistview.h"
 #include "private/kitemlistsmoothscroller.h"
 

+#ifndef QT_NO_ACCESSIBILITY
+#include "accessibility/kitemlistviewaccessible.h"
+#endif

 #include <QApplication>
 #include <QFontMetrics>
 #include <QGraphicsScene>
 #include <QApplication>
 #include <QFontMetrics>
 #include <QGraphicsScene>


@@ -30,13 +33,14 @@ class KItemListContainerViewport : public QGraphicsView
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
+    KItemListContainerViewport(QGraphicsScene *scene, QWidget *parent);
+

 protected:
 protected:

-    void wheelEvent(QWheelEvent* event) override;
+    void wheelEvent(QWheelEvent *event) override;

 };
 
 };
 

-KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) :
-    QGraphicsView(scene, parent)
+KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene *scene, QWidget *parent)
+    : QGraphicsView(scene, parent)

 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);


@@ -44,24 +48,24 @@ KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QW
     setFrameShape(QFrame::NoFrame);
 }
 
     setFrameShape(QFrame::NoFrame);
 }
 

-void KItemListContainerViewport::wheelEvent(QWheelEvent* event)
+void KItemListContainerViewport::wheelEvent(QWheelEvent *event)

 {
     // Assure that the wheel-event gets forwarded to the parent
     // and not handled at all by QGraphicsView.
     event->ignore();
 }
 
 {
     // Assure that the wheel-event gets forwarded to the parent
     // and not handled at all by QGraphicsView.
     event->ignore();
 }
 

-KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) :
-    QAbstractScrollArea(parent),
-    m_controller(controller),
-    m_horizontalSmoothScroller(nullptr),
-    m_verticalSmoothScroller(nullptr),
-    m_scroller(nullptr)
+KItemListContainer::KItemListContainer(KItemListController *controller, QWidget *parent)
+    : QAbstractScrollArea(parent)
+    , m_controller(controller)
+    , m_horizontalSmoothScroller(nullptr)
+    , m_verticalSmoothScroller(nullptr)
+    , m_scroller(nullptr)

 {
     Q_ASSERT(controller);
     controller->setParent(this);
 
 {
     Q_ASSERT(controller);
     controller->setParent(this);
 

-    QGraphicsView* graphicsView = new KItemListContainerViewport(new QGraphicsScene(this), this);
+    QGraphicsView *graphicsView = new KItemListContainerViewport(new QGraphicsScene(this), this);

     setViewport(graphicsView);
 
     m_horizontalSmoothScroller = new KItemListSmoothScroller(horizontalScrollBar(), this);
     setViewport(graphicsView);
 
     m_horizontalSmoothScroller = new KItemListSmoothScroller(horizontalScrollBar(), this);


@@ -74,17 +78,13 @@ KItemListContainer::KItemListContainer(KItemListController* controller, QWidget*
         slotViewChanged(controller->view(), nullptr);
     }
 
         slotViewChanged(controller->view(), nullptr);
     }
 

-    connect(controller, &KItemListController::modelChanged,
-            this, &KItemListContainer::slotModelChanged);
-    connect(controller, &KItemListController::viewChanged,
-            this, &KItemListContainer::slotViewChanged);
+    connect(controller, &KItemListController::modelChanged, this, &KItemListContainer::slotModelChanged);
+    connect(controller, &KItemListController::viewChanged, this, &KItemListContainer::slotViewChanged);

 
     m_scroller = QScroller::scroller(viewport());
     m_scroller->grabGesture(viewport());
 
     m_scroller = QScroller::scroller(viewport());
     m_scroller->grabGesture(viewport());

-    connect(controller, &KItemListController::scrollerStop,
-            this, &KItemListContainer::stopScroller);
-    connect(m_scroller, &QScroller::stateChanged,
-            controller, &KItemListController::slotStateChanged);
+    connect(controller, &KItemListController::scrollerStop, this, &KItemListContainer::stopScroller);
+    connect(m_scroller, &QScroller::stateChanged, controller, &KItemListController::slotStateChanged);

 }
 
 KItemListContainer::~KItemListContainer()
 }
 
 KItemListContainer::~KItemListContainer()


@@ -95,14 +95,14 @@ KItemListContainer::~KItemListContainer()
     m_controller = nullptr;
 }
 
     m_controller = nullptr;
 }
 

-KItemListController* KItemListContainer::controller() const
+KItemListController *KItemListContainer::controller() const

 {
     return m_controller;
 }
 
 void KItemListContainer::setEnabledFrame(bool enable)
 {
 {
     return m_controller;
 }
 
 void KItemListContainer::setEnabledFrame(bool enable)
 {

-    QGraphicsView* graphicsView = qobject_cast<QGraphicsView*>(viewport());
+    QGraphicsView *graphicsView = qobject_cast<QGraphicsView *>(viewport());

     if (enable) {
         setFrameShape(QFrame::StyledPanel);
         graphicsView->setPalette(palette());
     if (enable) {
         setFrameShape(QFrame::StyledPanel);
         graphicsView->setPalette(palette());


@@ -113,7 +113,7 @@ void KItemListContainer::setEnabledFrame(bool enable)
         // to the text color, so that enough contrast is given for all color
         // schemes
         QPalette p = graphicsView->palette();
         // to the text color, so that enough contrast is given for all color
         // schemes
         QPalette p = graphicsView->palette();

-        p.setColor(QPalette::Active,   QPalette::Text, p.color(QPalette::Active,   QPalette::WindowText));
+        p.setColor(QPalette::Active, QPalette::Text, p.color(QPalette::Active, QPalette::WindowText));

         p.setColor(QPalette::Inactive, QPalette::Text, p.color(QPalette::Inactive, QPalette::WindowText));
         p.setColor(QPalette::Disabled, QPalette::Text, p.color(QPalette::Disabled, QPalette::WindowText));
         graphicsView->setPalette(p);
         p.setColor(QPalette::Inactive, QPalette::Text, p.color(QPalette::Inactive, QPalette::WindowText));
         p.setColor(QPalette::Disabled, QPalette::Text, p.color(QPalette::Disabled, QPalette::WindowText));
         graphicsView->setPalette(p);


@@ -123,11 +123,11 @@ void KItemListContainer::setEnabledFrame(bool enable)
 
 bool KItemListContainer::enabledFrame() const
 {
 
 bool KItemListContainer::enabledFrame() const
 {

-    const QGraphicsView* graphicsView = qobject_cast<QGraphicsView*>(viewport());
+    const QGraphicsView *graphicsView = qobject_cast<QGraphicsView *>(viewport());

     return graphicsView->autoFillBackground();
 }
 
     return graphicsView->autoFillBackground();
 }
 

-void KItemListContainer::keyPressEvent(QKeyEvent* event)
+void KItemListContainer::keyPressEvent(QKeyEvent *event)

 {
     // TODO: We should find a better way to handle the key press events in the view.
     // The reasons why we need this hack are:
 {
     // TODO: We should find a better way to handle the key press events in the view.
     // The reasons why we need this hack are:


@@ -135,19 +135,34 @@ void KItemListContainer::keyPressEvent(QKeyEvent* event)
     // 2. By default, the KItemListView does not have the keyboard focus in the QGraphicsScene, so
     //    simply sending the event to the QGraphicsView which is the KItemListContainer's viewport
     //    does not work.
     // 2. By default, the KItemListView does not have the keyboard focus in the QGraphicsScene, so
     //    simply sending the event to the QGraphicsView which is the KItemListContainer's viewport
     //    does not work.

-    KItemListView* view = m_controller->view();
+    KItemListView *view = m_controller->view();
+    if (view) {
+        QApplication::sendEvent(view, event);
+    }
+}
+
+void KItemListContainer::contextMenuEvent(QContextMenuEvent *event)
+{
+    // Note copied from the keyPressEvent() method above because the same reasons probably also apply here.
+    // TODO: We should find a better way to handle the context menu events in the view.
+    // The reasons why we need this hack are:
+    // 1. Without reimplementing contextMenuEvent() here, the event would not reach the QGraphicsView.
+    // 2. By default, the KItemListView does not have the keyboard focus in the QGraphicsScene, so
+    //    simply sending the event to the QGraphicsView which is the KItemListContainer's viewport
+    //    does not work.
+    KItemListView *view = m_controller->view();

     if (view) {
         QApplication::sendEvent(view, event);
     }
 }
 
     if (view) {
         QApplication::sendEvent(view, event);
     }
 }
 

-void KItemListContainer::showEvent(QShowEvent* event)
+void KItemListContainer::showEvent(QShowEvent *event)

 {
     QAbstractScrollArea::showEvent(event);
     updateGeometries();
 }
 
 {
     QAbstractScrollArea::showEvent(event);
     updateGeometries();
 }
 

-void KItemListContainer::resizeEvent(QResizeEvent* event)
+void KItemListContainer::resizeEvent(QResizeEvent *event)

 {
     QAbstractScrollArea::resizeEvent(event);
     updateGeometries();
 {
     QAbstractScrollArea::resizeEvent(event);
     updateGeometries();


@@ -159,71 +174,91 @@ void KItemListContainer::scrollContentsBy(int dx, int dy)
     m_verticalSmoothScroller->scrollContentsBy(dy);
 }
 
     m_verticalSmoothScroller->scrollContentsBy(dy);
 }
 

-void KItemListContainer::wheelEvent(QWheelEvent* event)
+void KItemListContainer::wheelEvent(QWheelEvent *event)

 {
     if (event->modifiers().testFlag(Qt::ControlModifier)) {
         event->ignore();
         return;
     }
 
 {
     if (event->modifiers().testFlag(Qt::ControlModifier)) {
         event->ignore();
         return;
     }
 

-    KItemListView* view = m_controller->view();
+    KItemListView *view = m_controller->view();

     if (!view) {
         event->ignore();
         return;
     }
 
     if (!view) {
         event->ignore();
         return;
     }
 

-    const bool scrollHorizontally = (qAbs(event->angleDelta().y()) < qAbs(event->angleDelta().x())) ||
-                                    (!verticalScrollBar()->isVisible());
-    KItemListSmoothScroller* smoothScroller = scrollHorizontally ?
-                                              m_horizontalSmoothScroller : m_verticalSmoothScroller;
+    const bool scrollHorizontally = (qAbs(event->angleDelta().y()) < qAbs(event->angleDelta().x())) || (!verticalScrollBar()->isVisible());
+    KItemListSmoothScroller *smoothScroller = scrollHorizontally ? m_horizontalSmoothScroller : m_verticalSmoothScroller;

 
     smoothScroller->handleWheelEvent(event);
 }
 
 
     smoothScroller->handleWheelEvent(event);
 }
 

+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
+        });
+    }
+}
+
+void KItemListContainer::focusOutEvent(QFocusEvent *event)
+{
+    KItemListView *view = m_controller->view();
+    if (view) {
+        QApplication::sendEvent(view, event);
+    }
+}
+

 void KItemListContainer::slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {
     Q_UNUSED(previous)
     updateSmoothScrollers(current);
 }
 
 void KItemListContainer::slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {
     Q_UNUSED(previous)
     updateSmoothScrollers(current);
 }
 

-void KItemListContainer::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
+void KItemListContainer::slotModelChanged(KItemModelBase *current, KItemModelBase *previous)

 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
 }
 
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
 }
 

-void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView* previous)
+void KItemListContainer::slotViewChanged(KItemListView *current, KItemListView *previous)

 {
 {

-    QGraphicsScene* scene = static_cast<QGraphicsView*>(viewport())->scene();
+    QGraphicsScene *scene = static_cast<QGraphicsView *>(viewport())->scene();

     if (previous) {
         scene->removeItem(previous);
     if (previous) {
         scene->removeItem(previous);

-        disconnect(previous, &KItemListView::scrollOrientationChanged,
-                   this, &KItemListContainer::slotScrollOrientationChanged);
-        disconnect(previous, &KItemListView::scrollOffsetChanged,
-                   this, &KItemListContainer::updateScrollOffsetScrollBar);
-        disconnect(previous, &KItemListView::maximumScrollOffsetChanged,
-                   this, &KItemListContainer::updateScrollOffsetScrollBar);
-        disconnect(previous, &KItemListView::itemOffsetChanged,
-                   this, &KItemListContainer::updateItemOffsetScrollBar);
-        disconnect(previous, &KItemListView::maximumItemOffsetChanged,
-                   this, &KItemListContainer::updateItemOffsetScrollBar);
+        disconnect(previous, &KItemListView::scrollOrientationChanged, this, &KItemListContainer::slotScrollOrientationChanged);
+        disconnect(previous, &KItemListView::scrollOffsetChanged, this, &KItemListContainer::updateScrollOffsetScrollBar);
+        disconnect(previous, &KItemListView::maximumScrollOffsetChanged, this, &KItemListContainer::updateScrollOffsetScrollBar);
+        disconnect(previous, &KItemListView::itemOffsetChanged, this, &KItemListContainer::updateItemOffsetScrollBar);
+        disconnect(previous, &KItemListView::maximumItemOffsetChanged, this, &KItemListContainer::updateItemOffsetScrollBar);

         disconnect(previous, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo);
         disconnect(previous, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo);

+        disconnect(m_horizontalSmoothScroller, &KItemListSmoothScroller::scrollingStopped, previous, &KItemListView::scrollingStopped);
+        disconnect(m_verticalSmoothScroller, &KItemListSmoothScroller::scrollingStopped, previous, &KItemListView::scrollingStopped);

         m_horizontalSmoothScroller->setTargetObject(nullptr);
         m_verticalSmoothScroller->setTargetObject(nullptr);
     }
     if (current) {
         scene->addItem(current);
         m_horizontalSmoothScroller->setTargetObject(nullptr);
         m_verticalSmoothScroller->setTargetObject(nullptr);
     }
     if (current) {
         scene->addItem(current);

-        connect(current, &KItemListView::scrollOrientationChanged,
-                this, &KItemListContainer::slotScrollOrientationChanged);
-        connect(current, &KItemListView::scrollOffsetChanged,
-                this, &KItemListContainer::updateScrollOffsetScrollBar);
-        connect(current, &KItemListView::maximumScrollOffsetChanged,
-                this, &KItemListContainer::updateScrollOffsetScrollBar);
-        connect(current, &KItemListView::itemOffsetChanged,
-                this, &KItemListContainer::updateItemOffsetScrollBar);
-        connect(current, &KItemListView::maximumItemOffsetChanged,
-                this, &KItemListContainer::updateItemOffsetScrollBar);
+        connect(current, &KItemListView::scrollOrientationChanged, this, &KItemListContainer::slotScrollOrientationChanged);
+        connect(current, &KItemListView::scrollOffsetChanged, this, &KItemListContainer::updateScrollOffsetScrollBar);
+        connect(current, &KItemListView::maximumScrollOffsetChanged, this, &KItemListContainer::updateScrollOffsetScrollBar);
+        connect(current, &KItemListView::itemOffsetChanged, this, &KItemListContainer::updateItemOffsetScrollBar);
+        connect(current, &KItemListView::maximumItemOffsetChanged, this, &KItemListContainer::updateItemOffsetScrollBar);

         connect(current, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo);
         connect(current, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo);

+        connect(m_horizontalSmoothScroller, &KItemListSmoothScroller::scrollingStopped, current, &KItemListView::scrollingStopped);
+        connect(m_verticalSmoothScroller, &KItemListSmoothScroller::scrollingStopped, current, &KItemListView::scrollingStopped);
+

         m_horizontalSmoothScroller->setTargetObject(current);
         m_verticalSmoothScroller->setTargetObject(current);
         updateSmoothScrollers(current->scrollOrientation());
         m_horizontalSmoothScroller->setTargetObject(current);
         m_verticalSmoothScroller->setTargetObject(current);
         updateSmoothScrollers(current->scrollOrientation());


@@ -232,7 +267,7 @@ void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView*
 
 void KItemListContainer::scrollTo(qreal offset)
 {
 
 void KItemListContainer::scrollTo(qreal offset)
 {

-    const KItemListView* view = m_controller->view();
+    const KItemListView *view = m_controller->view();

     if (view) {
         if (view->scrollOrientation() == Qt::Vertical) {
             m_verticalSmoothScroller->scrollTo(offset);
     if (view) {
         if (view->scrollOrientation() == Qt::Vertical) {
             m_verticalSmoothScroller->scrollTo(offset);


@@ -244,27 +279,22 @@ void KItemListContainer::scrollTo(qreal offset)
 
 void KItemListContainer::updateScrollOffsetScrollBar()
 {
 
 void KItemListContainer::updateScrollOffsetScrollBar()
 {

-    const KItemListView* view = m_controller->view();
+    const KItemListView *view = m_controller->view();

     if (!view) {
         return;
     }
 
     if (!view) {
         return;
     }
 

-    KItemListSmoothScroller* smoothScroller = nullptr;
-    QScrollBar* scrollOffsetScrollBar = nullptr;
-    int singleStep = 0;
+    KItemListSmoothScroller *smoothScroller = nullptr;
+    QScrollBar *scrollOffsetScrollBar = nullptr;

     int pageStep = 0;
     int maximum = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_verticalSmoothScroller;
     int pageStep = 0;
     int maximum = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_verticalSmoothScroller;

+        if (smoothScroller->isAnimating()) {
+            return;
+        }

         scrollOffsetScrollBar = verticalScrollBar();
 
         scrollOffsetScrollBar = verticalScrollBar();
 

-        // Don't scroll super fast when using a wheel mouse:
-        // We want to consider one "line" to be the text label which has a
-        // roughly fixed height rather than using the height of the icon which
-        // may be very tall
-        const QFontMetrics metrics(font());
-        singleStep = metrics.height() * QApplication::wheelScrollLines();
-

         // We cannot use view->size().height() because this height might
         // include the header widget, which is not part of the scrolled area.
         pageStep = view->verticalPageStep();
         // We cannot use view->size().height() because this height might
         // include the header widget, which is not part of the scrolled area.
         pageStep = view->verticalPageStep();


@@ -276,16 +306,18 @@ void KItemListContainer::updateScrollOffsetScrollBar()
         maximum = qMax(0, int(view->maximumScrollOffset() - view->size().height()));
     } else {
         smoothScroller = m_horizontalSmoothScroller;
         maximum = qMax(0, int(view->maximumScrollOffset() - view->size().height()));
     } else {
         smoothScroller = m_horizontalSmoothScroller;

+        if (smoothScroller->isAnimating()) {
+            return;
+        }

         scrollOffsetScrollBar = horizontalScrollBar();
         scrollOffsetScrollBar = horizontalScrollBar();

-        singleStep = view->itemSize().width();

         pageStep = view->size().width();
         maximum = qMax(0, int(view->maximumScrollOffset() - view->size().width()));
     }
 
         pageStep = view->size().width();
         maximum = qMax(0, int(view->maximumScrollOffset() - view->size().width()));
     }
 

+    const int singleStep = view->scrollSingleStep();

     const int value = view->scrollOffset();
     if (smoothScroller->requestScrollBarUpdate(maximum)) {
     const int value = view->scrollOffset();
     if (smoothScroller->requestScrollBarUpdate(maximum)) {

-        const bool updatePolicy = (scrollOffsetScrollBar->maximum() > 0 && maximum == 0)
-                                  || horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOn;
+        const bool updatePolicy = (scrollOffsetScrollBar->maximum() > 0 && maximum == 0) || horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOn;

 
         scrollOffsetScrollBar->setSingleStep(singleStep);
         scrollOffsetScrollBar->setPageStep(pageStep);
 
         scrollOffsetScrollBar->setSingleStep(singleStep);
         scrollOffsetScrollBar->setPageStep(pageStep);


@@ -302,22 +334,28 @@ void KItemListContainer::updateScrollOffsetScrollBar()
 
 void KItemListContainer::updateItemOffsetScrollBar()
 {
 
 void KItemListContainer::updateItemOffsetScrollBar()
 {

-    const KItemListView* view = m_controller->view();
+    const KItemListView *view = m_controller->view();

     if (!view) {
         return;
     }
 
     if (!view) {
         return;
     }
 

-    KItemListSmoothScroller* smoothScroller = nullptr;
-    QScrollBar* itemOffsetScrollBar = nullptr;
+    KItemListSmoothScroller *smoothScroller = nullptr;
+    QScrollBar *itemOffsetScrollBar = nullptr;

     int singleStep = 0;
     int pageStep = 0;
     if (view->scrollOrientation() == Qt::Vertical) {
         smoothScroller = m_horizontalSmoothScroller;
     int singleStep = 0;
     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;
         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();
         itemOffsetScrollBar = verticalScrollBar();
         singleStep = view->size().height() / 10;
         pageStep = view->size().height();


@@ -351,23 +389,19 @@ void KItemListContainer::updateGeometries()
         scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this);
     }
 
         scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this);
     }
 

-    const int widthDec = verticalScrollBar()->isVisible()
-                         ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
-                         : extra;
+    const int widthDec = verticalScrollBar()->isVisible() ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) : extra;

 
 

-    const int heightDec = horizontalScrollBar()->isVisible()
-                          ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
-                          : extra;
+    const int heightDec =
+        horizontalScrollBar()->isVisible() ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) : extra;

 
 

-    const QRectF newGeometry(0, 0, rect.width() - widthDec,
-                             rect.height() - heightDec);
+    const QRectF newGeometry(0, 0, rect.width() - widthDec, rect.height() - heightDec);

     if (m_controller->view()->geometry() != newGeometry) {
         m_controller->view()->setGeometry(newGeometry);
 
         // Get the real geometry of the view again since the scrollbars
         // visibilities and the view geometry may have changed in re-layout.
     if (m_controller->view()->geometry() != newGeometry) {
         m_controller->view()->setGeometry(newGeometry);
 
         // Get the real geometry of the view again since the scrollbars
         // visibilities and the view geometry may have changed in re-layout.

-        static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(m_controller->view()->geometry());
-        static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(m_controller->view()->geometry().toRect());
+        static_cast<KItemListContainerViewport *>(viewport())->scene()->setSceneRect(m_controller->view()->geometry());
+        static_cast<KItemListContainerViewport *>(viewport())->viewport()->setGeometry(m_controller->view()->geometry().toRect());

 
         updateScrollOffsetScrollBar();
         updateItemOffsetScrollBar();
 
         updateScrollOffsetScrollBar();
         updateItemOffsetScrollBar();


@@ -383,11 +417,16 @@ void KItemListContainer::updateSmoothScrollers(Qt::Orientation orientation)
         m_horizontalSmoothScroller->setPropertyName("scrollOffset");
         m_verticalSmoothScroller->setPropertyName("itemOffset");
     }
         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()
 {
 }
 
 void KItemListContainer::updateScrollOffsetScrollBarPolicy()
 {

-    const KItemListView* view = m_controller->view();
+    const KItemListView *view = m_controller->view();

     Q_ASSERT(view);
     const bool vertical = (view->scrollOrientation() == Qt::Vertical);
 
     Q_ASSERT(view);
     const bool vertical = (view->scrollOrientation() == Qt::Vertical);
 


@@ -402,8 +441,7 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
         newViewSize.rheight() += scrollBarInc;
     }
 
         newViewSize.rheight() += scrollBarInc;
     }
 

-    const Qt::ScrollBarPolicy policy = view->scrollBarRequired(newViewSize)
-                                       ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAsNeeded;
+    const Qt::ScrollBarPolicy policy = view->scrollBarRequired(newViewSize) ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAsNeeded;

     if (vertical) {
         setVerticalScrollBarPolicy(policy);
     } else {
     if (vertical) {
         setVerticalScrollBarPolicy(policy);
     } else {


@@ -412,3 +450,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
 }
 
 #include "kitemlistcontainer.moc"
 }
 
 #include "kitemlistcontainer.moc"

+#include "moc_kitemlistcontainer.cpp"