Differential D13901 Diff 38692 lib/thumbnailview/thumbnailview.cpp

Changeset View

Standalone View

View Options

lib/thumbnailview/thumbnailview.cpp

Show All 30 Lines
31#include <QQueue> 31​#include <QQueue>
32#include <QScrollBar> 32​#include <QScrollBar>
33#include <QTimeLine> 33​#include <QTimeLine>
34#include <QTimer> 34​#include <QTimer>
35#include <QDrag> 35​#include <QDrag>
36#include <QMimeData> 36​#include <QMimeData>
37#include <QDebug> 37​#include <QDebug>
38#include <QDateTime> 38​#include <QDateTime>
39​#include <QScroller>
40​#include <QGestureEvent>
41​#include <QStyleHints>
39 42​
ngrahamUnsubmitted
Not Done

Unnecessary whitespace change

ngraham: Unnecessary whitespace change
40// KDE 43​// KDE
41#include <KDirModel> 44​#include <KDirModel>
42#include <KIconLoader> 45​#include <KIconLoader>
43#include <KPixmapSequence> 46​#include <KPixmapSequence>
44#include <KUrlMimeData> 47​#include <KUrlMimeData>
45 48​
46// Local 49​// Local
47#include "abstractdocumentinfoprovider.h" 50​#include "abstractdocumentinfoprovider.h"
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Line(s)171{
181 QPixmap mWaitingThumbnail; 184​ QPixmap mWaitingThumbnail;
182 QPointer<ThumbnailProvider> mThumbnailProvider; 185​ QPointer<ThumbnailProvider> mThumbnailProvider;
183 186​
184 PersistentModelIndexSet mBusyIndexSet; 187​ PersistentModelIndexSet mBusyIndexSet;
185 KPixmapSequence mBusySequence; 188​ KPixmapSequence mBusySequence;
186 QTimeLine* mBusyAnimationTimeLine; 189​ QTimeLine* mBusyAnimationTimeLine;
187 190​
188 bool mCreateThumbnailsForRemoteUrls; 191​ bool mCreateThumbnailsForRemoteUrls;
192​ bool isOnlyTab;
193​ qint64 timestamp;
194​ bool firstMoving;
195​ bool dragIsStarted;
196​ QScroller* mScroller;
197​ QPointF startCenterPoint;
198​ bool dontZoom;
189 199​
190 void setupBusyAnimation() 200​ void setupBusyAnimation()
191 { 201​ {
192 mBusySequence = KIconLoader::global()->loadPixmapSequence(QStringLiteral("process-working"), 22); 202​ mBusySequence = KIconLoader::global()->loadPixmapSequence(QStringLiteral("process-working"), 22);
193 mBusyAnimationTimeLine = new QTimeLine(100 * mBusySequence.frameCount(), q); 203​ mBusyAnimationTimeLine = new QTimeLine(100 * mBusySequence.frameCount(), q);
194 mBusyAnimationTimeLine->setCurveShape(QTimeLine::LinearCurve); 204​ mBusyAnimationTimeLine->setCurveShape(QTimeLine::LinearCurve);
195 mBusyAnimationTimeLine->setEndFrame(mBusySequence.frameCount() - 1); 205​ mBusyAnimationTimeLine->setEndFrame(mBusySequence.frameCount() - 1);
196 mBusyAnimationTimeLine->setLoopCount(0); 206​ mBusyAnimationTimeLine->setLoopCount(0);
▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Line(s)295{
304 setUniformItemSizes(true); 314​ setUniformItemSizes(true);
305 setEditTriggers(QAbstractItemView::EditKeyPressed); 315​ setEditTriggers(QAbstractItemView::EditKeyPressed);
306 316​
307 d->setupBusyAnimation(); 317​ d->setupBusyAnimation();
308 318​
309 setVerticalScrollMode(ScrollPerPixel); 319​ setVerticalScrollMode(ScrollPerPixel);
310 setHorizontalScrollMode(ScrollPerPixel); 320​ setHorizontalScrollMode(ScrollPerPixel);
311 321​
322​ d->mScroller = QScroller::scroller(this->viewport());
323​ QScrollerProperties scrollerProp = d->mScroller->scrollerProperties();
324​ scrollerProp.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy,1);
325​ scrollerProp.setScrollMetric(QScrollerProperties::VerticalOvershootPolicy,1);
326​ d->mScroller->setScrollerProperties(scrollerProp);
327​ d->mScroller->grabGesture(this->viewport(), QScroller::TouchGesture);
328​ viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
329​ viewport()->grabGesture(Qt::PinchGesture);
330​
312 d->mScheduledThumbnailGenerationTimer.setSingleShot(true); 331​ d->mScheduledThumbnailGenerationTimer.setSingleShot(true);
313 d->mScheduledThumbnailGenerationTimer.setInterval(500); 332​ d->mScheduledThumbnailGenerationTimer.setInterval(500);
314 connect(&d->mScheduledThumbnailGenerationTimer, &QTimer::timeout, this, &ThumbnailView::generateThumbnailsForItems); 333​ connect(&d->mScheduledThumbnailGenerationTimer, &QTimer::timeout, this, &ThumbnailView::generateThumbnailsForItems);
315 334​
316 d->mSmoothThumbnailTimer.setSingleShot(true); 335​ d->mSmoothThumbnailTimer.setSingleShot(true);
317 connect(&d->mSmoothThumbnailTimer, &QTimer::timeout, this, &ThumbnailView::smoothNextThumbnail); 336​ connect(&d->mSmoothThumbnailTimer, &QTimer::timeout, this, &ThumbnailView::smoothNextThumbnail);
318 337​
319 setContextMenuPolicy(Qt::CustomContextMenu); 338​ setContextMenuPolicy(Qt::CustomContextMenu);
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Line(s)701{
691 } 710​ }
692 711​
693 QDrag* drag = new QDrag(this); 712​ QDrag* drag = new QDrag(this);
694 drag->setMimeData(MimeTypeUtils::selectionMimeData(selectedFiles)); 713​ drag->setMimeData(MimeTypeUtils::selectionMimeData(selectedFiles));
695 d->initDragPixmap(drag, indexes); 714​ d->initDragPixmap(drag, indexes);
696 drag->exec(supportedActions, Qt::CopyAction); 715​ drag->exec(supportedActions, Qt::CopyAction);
697} 716​}
698 717​
718​bool ThumbnailView::viewportEvent(QEvent* event)
rkflxUnsubmitted
Not Done

This also seems to duplicate code, but again, is there any mechanism in Qt for handling this instead of having to code so much manual handling of the touch events?

rkflx: This also seems to duplicate code, but again, is there any mechanism in Qt for handling this…
719​{
720​ switch (event->type()) {
721​ case QEvent::TouchBegin: {
722​ QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
723​ event->accept();
724​ d->timestamp = touchEvent->timestamp();
725​ d->firstMoving = true;
726​ d->dragIsStarted = false;
727​ d->isOnlyTab = true;
728​ QModelIndex index = indexAt(touchEvent->touchPoints().at(0).pos().toPoint());
729​ setCurrentIndex(index);
730​ return true;
731​ }
732​
733​ case QEvent::TouchUpdate: {
734​ event->accept();
735​ QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
736​ qreal now = touchEvent->timestamp();
737​ QPointF distance = touchEvent->touchPoints().at(0).startPos() - touchEvent->touchPoints().at(0).pos();
738​ if (d->isOnlyTab && now - d->timestamp < 100 && distance.manhattanLength() < 40 && touchEvent->touchPoints().size() == 1) {
739​ d->isOnlyTab = true;
740​ } else {
741​ d->isOnlyTab = false;
742​ }
743​ if (touchEvent->touchPoints().size() == 2) {
744​ d->dontZoom = true;
745​ if (now - d->timestamp >= 300) {
746​ QPointF startone = touchEvent->touchPoints().at(0).startPos();
747​ QPointF starttwo = touchEvent->touchPoints().at(1).startPos();
748​ QPointF endone = touchEvent->touchPoints().at(0).pos();
749​ QPointF endtwo = touchEvent->touchPoints().at(1).pos();
750​ QPointF vectorone = startone - endone;
751​ QPointF vectortwo = starttwo - endtwo;
752​ int x = (vectorone).x() * (vectortwo).x();
753​ int y = (vectorone).y() * (vectortwo).y();
754​ if (x == 0 && y>0) x=1;
755​ if (y == 0 && x>0) y=1;
756​ if (x >= -500 && x<0 && y>0) x=1;
757​ if (y >= -500 && y<0 && x>0) y=1;
758​ if (x>0 && y>0) {
759​ d->dontZoom = true;
760​ } else {
761​ if (vectorone.manhattanLength() > 50 || vectortwo.manhattanLength() > 50){
762​ d->dontZoom = false;
763​ }
764​ }
765​ }
766​ }
767​ if (touchEvent->touchPoints().size() == 1) {
768​ qint64 now = touchEvent->timestamp();
769​ QPointF startPos = touchEvent->touchPoints().at(0).startPos();
770​ QPointF nowPos = touchEvent->touchPoints().at(0).pos();
771​ if (d->firstMoving && now - d->timestamp >= 400 && (nowPos - startPos).manhattanLength() <= 20) {
772​ if (!d->dragIsStarted) {
773​ d->mScroller->stop();
774​ d->dragIsStarted = true;
775​ d->firstMoving = false;
776​ startDrag(Qt::CopyAction);
777​ }
778​ }
779​ }
780​ if (d->dragIsStarted) {
781​ QWidget *receiver = this->viewport();
782​ QPoint pos = touchEvent->touchPoints().at(0).pos().toPoint();
783​ QMouseEvent* evt = new QMouseEvent(QEvent::MouseMove,pos, Qt::NoButton, Qt::LeftButton,0);
784​ QCoreApplication::postEvent(receiver,evt);
785​ }
786​ d->firstMoving = false;
787​ return true;
788​ }
789​
790​ case QEvent::TouchEnd: {
791​ event->accept();
792​ QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
793​ if (d->dragIsStarted) {
794​ QWidget *receiver = this->viewport();
795​ QPoint pos = touchEvent->touchPoints().at(0).pos().toPoint();
796​ QMouseEvent* evt = new QMouseEvent(QEvent::MouseButtonRelease,pos, Qt::LeftButton, Qt::LeftButton,0);
797​ QCoreApplication::postEvent(receiver,evt);
798​ d->dragIsStarted = false;
799​ return true;
800​ }
801​ QPointF startPos = touchEvent->touchPoints().at(0).startPos();
802​ QPointF endPos = touchEvent->touchPoints().at(0).pos();
803​ qreal diff = (endPos-startPos).manhattanLength();
804​ if (d->isOnlyTab && touchEvent->touchPoints().size() == 1 && diff <= 20) {
805​ QPoint pos = touchEvent->touchPoints().at(0).startPos().toPoint();
806​ QWidget *receiver = this->viewport();
807​ QMouseEvent* evt = new QMouseEvent(QEvent::MouseButtonPress,pos, Qt::LeftButton, Qt::LeftButton,0);
808​ QCoreApplication::postEvent(receiver,evt);
809​ QMouseEvent* evtr = new QMouseEvent(QEvent::MouseButtonRelease,pos, Qt::LeftButton, Qt::LeftButton,0);
810​ QCoreApplication::postEvent(receiver,evtr);
811​ if (!QGuiApplication::styleHints()->singleClickActivation()) {
812​ QMouseEvent* evt = new QMouseEvent(QEvent::MouseButtonDblClick,pos, Qt::LeftButton, Qt::LeftButton,0);
813​ QCoreApplication::postEvent(receiver,evt);
814​ }
815​ }
816​ return true;
817​ }
818​ case QEvent::Gesture: {
819​ if (gestureEvent(static_cast<QGestureEvent*>( event ))) {
820​ return true;
821​ }
822​ }
823​ default:
824​ break;
825​ }
826​
827​ return QListView::viewportEvent(event);
828​}
829​
830​bool ThumbnailView::gestureEvent( QGestureEvent* event)
831​{
832​ static int zoomCounter;
833​ QPinchGesture *pinch = static_cast<QPinchGesture*>(event->gesture(Qt::PinchGesture));
834​ if (pinch)
835​ {
836​
837​ event->accept();
838​ if (pinch->state() == Qt::GestureStarted) {
839​ d->startCenterPoint = pinch->centerPoint();
840​ zoomCounter = 0;
841​ return true;
842​ }
843​
844​ if (pinch->state() == Qt::GestureUpdated) {
845​ if (!d->dontZoom) {
846​ zoomCounter++;
847​ if (zoomCounter == 1) {
rkflxUnsubmitted
Not Done

So essentially this is a bool? Also, what is it needed for?

rkflx: So essentially this is a `bool`? Also, what is it needed for?
steffenhAuthorUnsubmitted
Not Done

I know it is a little bit crude, the aim was, to lower the sensitivity of the zoom. I wanted to use only every second gesture event to zoom the size of the thumbnail. Because the thumbnail size is an integer, I cannot modify the size in 0.5 steps.
Maybe I need to save the start size of the thumbnail in the zoom begin, and use this to calculate the next size, I need to test this.

steffenh: I know it is a little bit crude, the aim was, to lower the sensitivity of the zoom. I wanted to…
848​ int width = d->mThumbnailSize.width() + ((pinch->scaleFactor() > 1 ? 1 : -1) * 1);
849​ width = qMax(int(MinThumbnailSize), qMin(width, int(MaxThumbnailSize)));
rkflxUnsubmitted
Not Done

Use qBound.

rkflx: Use `qBound`.
850​ setThumbnailWidth(width);
851​ zoomCounter = 0;
852​ }
853​ return true;
854​ }
855​ }
856​ if (pinch->state() == Qt::GestureFinished) {
857​ return true;
858​ }
859​ }
860​ return false;
861​}
862​
699void ThumbnailView::dragEnterEvent(QDragEnterEvent* event) 863​void ThumbnailView::dragEnterEvent(QDragEnterEvent* event)
700{ 864​{
701 QAbstractItemView::dragEnterEvent(event); 865​ QAbstractItemView::dragEnterEvent(event);
702 if (event->mimeData()->hasUrls()) { 866​ if (event->mimeData()->hasUrls()) {
703 event->acceptProposedAction(); 867​ event->acceptProposedAction();
704 } 868​ }
705} 869​}
706 870​
▲ Show 20 Lines • Show All 270 Lines • Show Last 20 Lines