Commit 7a9b8969 authored by Clément Fauconnier's avatar Clément Fauconnier

fixed some bad behaviors around thumbnail views and document persistence

parent 746382ef
......@@ -1539,10 +1539,10 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
mActiveScene = targetScene;
mActiveSceneIndex = index;
persistCurrentScene();
setDocument(pDocumentProxy, forceReload);
persistCurrentScene();
updateSystemScaleFactor();
mControlView->setScene(mActiveScene);
......
......@@ -183,14 +183,17 @@ void UBBoardThumbnailsView::resizeEvent(QResizeEvent *event)
}
void UBBoardThumbnailsView::mousePressEvent(QMouseEvent *event)
{
{
mLongPressTimer.start();
mLastPressedMousePos = event->pos();
UBDraggableThumbnailView* item = dynamic_cast<UBDraggableThumbnailView*>(itemAt(event->pos()));
if (item)
{
UBApplication::boardController->persistCurrentScene();
UBApplication::boardController->setActiveDocumentScene(item->sceneIndex());
}
QGraphicsView::mousePressEvent(event);
}
......@@ -202,7 +205,9 @@ void UBBoardThumbnailsView::mouseMoveEvent(QMouseEvent *event)
void UBBoardThumbnailsView::longPressTimeout()
{
emit mousePressAndHoldEventRequired(mLastPressedMousePos);
if (QApplication::mouseButtons() != Qt::NoButton)
emit mousePressAndHoldEventRequired(mLastPressedMousePos);
mLongPressTimer.stop();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment