From 3c5d10e04ebeb80b1d1b7a3d25e89b8e5223dc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Fri, 3 Nov 2017 14:17:18 +0100 Subject: [PATCH] disable movePage icons + drag and drop thumbnail sized correctly --- src/gui/UBBoardThumbnailsView.cpp | 2 +- src/gui/UBThumbnailWidget.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/UBBoardThumbnailsView.cpp b/src/gui/UBBoardThumbnailsView.cpp index 358529da..d37fdc02 100644 --- a/src/gui/UBBoardThumbnailsView.cpp +++ b/src/gui/UBBoardThumbnailsView.cpp @@ -219,7 +219,7 @@ void UBBoardThumbnailsView::mousePressAndHoldEvent(QPoint pos) mDropSource = item; mDropTarget = item; - QPixmap pixmap = item->widget()->grab().scaledToWidth(UBSettings::defaultThumbnailWidth); + QPixmap pixmap = item->widget()->grab().scaledToWidth(mThumbnailWidth/2); QDrag *drag = new QDrag(this); drag->setMimeData(new QMimeData()); diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp index 07612144..788c7f6d 100644 --- a/src/gui/UBThumbnailWidget.cpp +++ b/src/gui/UBThumbnailWidget.cpp @@ -901,10 +901,11 @@ void UBDraggableThumbnail::mousePressEvent(QGraphicsSceneMouseEvent *event) deletePage(); else if(getIcon("duplicate")->triggered(p.x())) duplicatePage(); + /* else if(movableUp() && getIcon("moveUp")->triggered(p.x())) moveUpPage(); else if (movableDown() && getIcon("moveDown")->triggered(p.x())) - moveDownPage(); + moveDownPage();*/ } event->accept();