X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/aff9b9570edf833eed12850c19b6833291822ea9..ddbfe135ce9cec0033e9b6d26429c6e255f0b1b2:/src/kitemviews/kitemlistcontainer.cpp diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index 58f2e3cd6..3ec56e5f1 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -1,42 +1,28 @@ -/*************************************************************************** - * Copyright (C) 2011 by Peter Penz * - * * - * Based on the Itemviews NG project from Trolltech Labs: * - * http://qt.gitorious.org/qt-labs/itemviews-ng * - * * - * 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: 2011 Peter Penz + * + * Based on the Itemviews NG project from Trolltech Labs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "kitemlistcontainer.h" #include "kitemlistcontroller.h" -#include "kitemlistsmoothscroller_p.h" #include "kitemlistview.h" -#include "kitemmodelbase.h" +#include "private/kitemlistsmoothscroller.h" +#ifndef QT_NO_ACCESSIBILITY +#include "accessibility/kitemlistviewaccessible.h" +#endif #include +#include #include #include -#include #include -#include +#include #include -#include - /** * Replaces the default viewport of KItemListContainer by a * non-scrollable viewport. The scrolling is done in an optimized @@ -44,14 +30,17 @@ */ class KItemListContainerViewport : public QGraphicsView { + Q_OBJECT + public: - KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent); + KItemListContainerViewport(QGraphicsScene *scene, QWidget *parent); + protected: - virtual void wheelEvent(QWheelEvent* event); + 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); @@ -59,45 +48,86 @@ KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QW 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(); } - - -KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) : - QAbstractScrollArea(parent), - m_controller(controller), - m_horizontalSmoothScroller(0), - m_verticalSmoothScroller(0) +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); - initialize(); -} -KItemListContainer::KItemListContainer(QWidget* parent) : - QAbstractScrollArea(parent), - m_controller(0), - m_horizontalSmoothScroller(0), - m_verticalSmoothScroller(0) -{ - initialize(); + QGraphicsView *graphicsView = new KItemListContainerViewport(new QGraphicsScene(this), this); + setViewport(graphicsView); + + m_horizontalSmoothScroller = new KItemListSmoothScroller(horizontalScrollBar(), this); + m_verticalSmoothScroller = new KItemListSmoothScroller(verticalScrollBar(), this); + + if (controller->model()) { + slotModelChanged(controller->model(), nullptr); + } + if (controller->view()) { + slotViewChanged(controller->view(), nullptr); + } + + connect(controller, &KItemListController::modelChanged, this, &KItemListContainer::slotModelChanged); + connect(controller, &KItemListController::viewChanged, this, &KItemListContainer::slotViewChanged); + + m_scroller = QScroller::scroller(viewport()); + m_scroller->grabGesture(viewport()); + connect(controller, &KItemListController::scrollerStop, this, &KItemListContainer::stopScroller); + connect(m_scroller, &QScroller::stateChanged, controller, &KItemListController::slotStateChanged); } KItemListContainer::~KItemListContainer() { + // Don't rely on the QObject-order to delete the controller, otherwise + // the QGraphicsScene might get deleted before the view. + delete m_controller; + m_controller = nullptr; } -KItemListController* KItemListContainer::controller() const +KItemListController *KItemListContainer::controller() const { return m_controller; } -void KItemListContainer::keyPressEvent(QKeyEvent* event) +void KItemListContainer::setEnabledFrame(bool enable) +{ + QGraphicsView *graphicsView = qobject_cast(viewport()); + if (enable) { + setFrameShape(QFrame::StyledPanel); + graphicsView->setPalette(palette()); + graphicsView->viewport()->setAutoFillBackground(true); + } else { + setFrameShape(QFrame::NoFrame); + // Make the background of the container transparent and apply the window-text color + // 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::Inactive, QPalette::Text, p.color(QPalette::Inactive, QPalette::WindowText)); + p.setColor(QPalette::Disabled, QPalette::Text, p.color(QPalette::Disabled, QPalette::WindowText)); + graphicsView->setPalette(p); + graphicsView->viewport()->setAutoFillBackground(false); + } +} + +bool KItemListContainer::enabledFrame() const +{ + const QGraphicsView *graphicsView = qobject_cast(viewport()); + return graphicsView->autoFillBackground(); +} + +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: @@ -105,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. - KItemListView* view = m_controller->view(); + KItemListView *view = m_controller->view(); if (view) { QApplication::sendEvent(view, event); } } -void KItemListContainer::showEvent(QShowEvent* 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); + } +} + +void KItemListContainer::showEvent(QShowEvent *event) { QAbstractScrollArea::showEvent(event); updateGeometries(); } -void KItemListContainer::resizeEvent(QResizeEvent* event) +void KItemListContainer::resizeEvent(QResizeEvent *event) { QAbstractScrollArea::resizeEvent(event); updateGeometries(); @@ -129,67 +174,91 @@ void KItemListContainer::scrollContentsBy(int dx, int dy) m_verticalSmoothScroller->scrollContentsBy(dy); } -void KItemListContainer::wheelEvent(QWheelEvent* event) +void KItemListContainer::wheelEvent(QWheelEvent *event) { if (event->modifiers().testFlag(Qt::ControlModifier)) { event->ignore(); return; } - KItemListView* view = m_controller->view(); + KItemListView *view = m_controller->view(); if (!view) { event->ignore(); return; } - const bool scrollHorizontally = (event->orientation() == Qt::Horizontal) || - (event->orientation() == Qt::Vertical && !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); +} - const int numDegrees = event->delta() / 8; - const int numSteps = numDegrees / 15; +void KItemListContainer::focusInEvent(QFocusEvent *event) +{ + KItemListView *view = m_controller->view(); + if (view) { + QApplication::sendEvent(view, event); - const QScrollBar* scrollBar = smoothScroller->scrollBar(); - smoothScroller->scrollTo(scrollBar->value() - numSteps * scrollBar->pageStep() / 4); + // 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(QAccessible::queryAccessibleInterface(view))->setAccessibleFocusAndAnnounceAll(); +#endif + }); + } +} - event->accept(); +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); + 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(viewport())->scene(); + QGraphicsScene *scene = static_cast(viewport())->scene(); if (previous) { scene->removeItem(previous); - disconnect(previous, SIGNAL(scrollOrientationChanged(Qt::Orientation,Qt::Orientation)), this, SLOT(slotScrollOrientationChanged(Qt::Orientation,Qt::Orientation))); - disconnect(previous, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(updateScrollOffsetScrollBar())); - disconnect(previous, SIGNAL(maximumScrollOffsetChanged(qreal,qreal)), this, SLOT(updateScrollOffsetScrollBar())); - disconnect(previous, SIGNAL(itemOffsetChanged(qreal,qreal)), this, SLOT(updateItemOffsetScrollBar())); - disconnect(previous, SIGNAL(maximumItemOffsetChanged(qreal,qreal)), this, SLOT(updateItemOffsetScrollBar())); - disconnect(previous, SIGNAL(scrollTo(qreal)), this, SLOT(scrollTo(qreal))); - m_horizontalSmoothScroller->setTargetObject(0); - m_verticalSmoothScroller->setTargetObject(0); + 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(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); - connect(current, SIGNAL(scrollOrientationChanged(Qt::Orientation,Qt::Orientation)), this, SLOT(slotScrollOrientationChanged(Qt::Orientation,Qt::Orientation))); - connect(current, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(updateScrollOffsetScrollBar())); - connect(current, SIGNAL(maximumScrollOffsetChanged(qreal,qreal)), this, SLOT(updateScrollOffsetScrollBar())); - connect(current, SIGNAL(itemOffsetChanged(qreal,qreal)), this, SLOT(updateItemOffsetScrollBar())); - connect(current, SIGNAL(maximumItemOffsetChanged(qreal,qreal)), this, SLOT(updateItemOffsetScrollBar())); - connect(current, SIGNAL(scrollTo(qreal)), this, SLOT(scrollTo(qreal))); + 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(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()); @@ -198,7 +267,7 @@ void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView* 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); @@ -210,56 +279,83 @@ void KItemListContainer::scrollTo(qreal offset) void KItemListContainer::updateScrollOffsetScrollBar() { - const KItemListView* view = m_controller->view(); + const KItemListView *view = m_controller->view(); if (!view) { return; } - KItemListSmoothScroller* smoothScroller = 0; - QScrollBar* scrollOffsetScrollBar = 0; - int singleStep = 0; + KItemListSmoothScroller *smoothScroller = nullptr; + QScrollBar *scrollOffsetScrollBar = nullptr; int pageStep = 0; + int maximum = 0; if (view->scrollOrientation() == Qt::Vertical) { smoothScroller = m_verticalSmoothScroller; + if (smoothScroller->isAnimating()) { + return; + } scrollOffsetScrollBar = verticalScrollBar(); - singleStep = view->itemSize().height(); - pageStep = view->size().height(); + + // 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(); + + // However, the total height of the view must be considered for the + // maximum value of the scroll bar. Note that the view's scrollOffset() + // refers to the offset of the top part of the view, which might be + // hidden behind the header. + 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(); + maximum = qMax(0, int(view->maximumScrollOffset() - view->size().width())); } + const int singleStep = view->scrollSingleStep(); const int value = view->scrollOffset(); - const int maximum = qMax(0, int(view->maximumScrollOffset() - pageStep)); if (smoothScroller->requestScrollBarUpdate(maximum)) { + const bool updatePolicy = (scrollOffsetScrollBar->maximum() > 0 && maximum == 0) || horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOn; + scrollOffsetScrollBar->setSingleStep(singleStep); scrollOffsetScrollBar->setPageStep(pageStep); scrollOffsetScrollBar->setMinimum(0); scrollOffsetScrollBar->setMaximum(maximum); scrollOffsetScrollBar->setValue(value); + + if (updatePolicy) { + // Prevent a potential endless layout loop (see bug #293318). + updateScrollOffsetScrollBarPolicy(); + } } } void KItemListContainer::updateItemOffsetScrollBar() { - const KItemListView* view = m_controller->view(); + const KItemListView *view = m_controller->view(); if (!view) { return; } - KItemListSmoothScroller* smoothScroller = 0; - QScrollBar* itemOffsetScrollBar = 0; + KItemListSmoothScroller *smoothScroller = nullptr; + QScrollBar *itemOffsetScrollBar = nullptr; 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; + if (smoothScroller->isAnimating()) { + return; + } itemOffsetScrollBar = verticalScrollBar(); singleStep = view->size().height() / 10; pageStep = view->size().height(); @@ -276,6 +372,11 @@ void KItemListContainer::updateItemOffsetScrollBar() } } +void KItemListContainer::stopScroller() +{ + m_scroller->stop(); +} + void KItemListContainer::updateGeometries() { QRect rect = geometry(); @@ -283,26 +384,24 @@ void KItemListContainer::updateGeometries() int extra = frameWidth() * 2; QStyleOption option; option.initFrom(this); + int scrollbarSpacing = 0; if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, &option, this)) { - extra += style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this); + scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this); } - const int widthDec = verticalScrollBar()->isVisible() - ? extra + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) - : extra; - - const int heightDec = horizontalScrollBar()->isVisible() - ? extra + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) - : extra; + const int widthDec = verticalScrollBar()->isVisible() ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) : extra; - rect.adjust(0, 0, -widthDec, -heightDec); + const int heightDec = + horizontalScrollBar()->isVisible() ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) : extra; - const QRectF newGeometry(0, 0, rect.width(), rect.height()); + const QRectF newGeometry(0, 0, rect.width() - widthDec, rect.height() - heightDec); if (m_controller->view()->geometry() != newGeometry) { m_controller->view()->setGeometry(newGeometry); - static_cast(viewport())->scene()->setSceneRect(0, 0, rect.width(), rect.height()); - static_cast(viewport())->viewport()->setGeometry(QRect(0, 0, rect.width(), rect.height())); + // Get the real geometry of the view again since the scrollbars + // visibilities and the view geometry may have changed in re-layout. + static_cast(viewport())->scene()->setSceneRect(m_controller->view()->geometry()); + static_cast(viewport())->viewport()->setGeometry(m_controller->view()->geometry().toRect()); updateScrollOffsetScrollBar(); updateItemOffsetScrollBar(); @@ -318,31 +417,37 @@ 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::initialize() +void KItemListContainer::updateScrollOffsetScrollBarPolicy() { - if (m_controller) { - if (m_controller->model()) { - slotModelChanged(m_controller->model(), 0); - } - if (m_controller->view()) { - slotViewChanged(m_controller->view(), 0); - } - } else { - m_controller = new KItemListController(this); - } + const KItemListView *view = m_controller->view(); + Q_ASSERT(view); + const bool vertical = (view->scrollOrientation() == Qt::Vertical); - connect(m_controller, SIGNAL(modelChanged(KItemModelBase*,KItemModelBase*)), - this, SLOT(slotModelChanged(KItemModelBase*,KItemModelBase*))); - connect(m_controller, SIGNAL(viewChanged(KItemListView*,KItemListView*)), - this, SLOT(slotViewChanged(KItemListView*,KItemListView*))); + QStyleOption option; + option.initFrom(this); + const int scrollBarInc = style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this); - QGraphicsView* graphicsView = new KItemListContainerViewport(new QGraphicsScene(this), this); - setViewport(graphicsView); + QSizeF newViewSize = m_controller->view()->size(); + if (vertical) { + newViewSize.rwidth() += scrollBarInc; + } else { + newViewSize.rheight() += scrollBarInc; + } - m_horizontalSmoothScroller = new KItemListSmoothScroller(horizontalScrollBar(), this); - m_verticalSmoothScroller = new KItemListSmoothScroller(verticalScrollBar(), this); + const Qt::ScrollBarPolicy policy = view->scrollBarRequired(newViewSize) ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAsNeeded; + if (vertical) { + setVerticalScrollBarPolicy(policy); + } else { + setHorizontalScrollBarPolicy(policy); + } } #include "kitemlistcontainer.moc" +#include "moc_kitemlistcontainer.cpp"