diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index a4d7e249..49f0eef8 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1586,7 +1586,6 @@ void UBBoardController::moveSceneToIndex(int source, int target) { if (selectedDocument()) { - persistCurrentScene(false,true); UBDocumentContainer::movePageToIndex(source, target); @@ -1598,10 +1597,8 @@ void UBBoardController::moveSceneToIndex(int source, int target) setActiveDocumentScene(target); mMovingSceneIndex = -1; - //on board thumbnails view - emit moveThumbnailRequired(source, target); - emit activeSceneChanged(); + emit updateThumbnailsRequired(); } } diff --git a/src/document/UBDocumentContainer.cpp b/src/document/UBDocumentContainer.cpp index 75fcc979..9bc9601c 100644 --- a/src/document/UBDocumentContainer.cpp +++ b/src/document/UBDocumentContainer.cpp @@ -75,7 +75,8 @@ bool UBDocumentContainer::movePageToIndex(int source, int target) deleteThumbPage(source); insertThumbPage(target); emit documentThumbnailsUpdated(this); - + //on board thumbnails view + emit moveThumbnailRequired(source, target); return true; } diff --git a/src/document/UBDocumentContainer.h b/src/document/UBDocumentContainer.h index a15d455f..8ee9b5c0 100644 --- a/src/document/UBDocumentContainer.h +++ b/src/document/UBDocumentContainer.h @@ -80,6 +80,7 @@ class UBDocumentContainer : public QObject void addThumbnailRequired(UBDocumentContainer* source, int index); void removeThumbnailRequired(int index); void moveThumbnailRequired(int from, int to); + void updateThumbnailsRequired(); void documentThumbnailsUpdated(UBDocumentContainer* source); }; diff --git a/src/gui/UBBoardThumbnailsView.cpp b/src/gui/UBBoardThumbnailsView.cpp index 1fec923e..74a314c6 100644 --- a/src/gui/UBBoardThumbnailsView.cpp +++ b/src/gui/UBBoardThumbnailsView.cpp @@ -78,6 +78,7 @@ UBBoardThumbnailsView::UBBoardThumbnailsView(QWidget *parent, const char *name) connect(UBApplication::boardController, SIGNAL(addThumbnailRequired(UBDocumentContainer*, int)), this, SLOT(addThumbnail(UBDocumentContainer*, int)), Qt::UniqueConnection); connect(UBApplication::boardController, SIGNAL(moveThumbnailRequired(int, int)), this, SLOT(moveThumbnail(int, int)), Qt::UniqueConnection); connect(this, SIGNAL(moveThumbnailRequired(int, int)), this, SLOT(moveThumbnail(int, int)), Qt::UniqueConnection); + connect(UBApplication::boardController, SIGNAL(updateThumbnailsRequired()), this, SLOT(updateThumbnails()), Qt::UniqueConnection); connect(UBApplication::boardController, SIGNAL(removeThumbnailRequired(int)), this, SLOT(removeThumbnail(int)), Qt::UniqueConnection); connect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressTimeout()), Qt::UniqueConnection); @@ -94,6 +95,11 @@ void UBBoardThumbnailsView::moveThumbnail(int from, int to) updateThumbnailsPos(); } +void UBBoardThumbnailsView::updateThumbnails() +{ + updateThumbnailsPos(); +} + void UBBoardThumbnailsView::removeThumbnail(int i) { UBDraggableThumbnailView* item = mThumbnails.at(i); diff --git a/src/gui/UBBoardThumbnailsView.h b/src/gui/UBBoardThumbnailsView.h index 77a3b0ba..5dff6a59 100644 --- a/src/gui/UBBoardThumbnailsView.h +++ b/src/gui/UBBoardThumbnailsView.h @@ -52,6 +52,7 @@ public slots: void addThumbnail(UBDocumentContainer* source, int i); void moveThumbnail(int from, int to); void removeThumbnail(int i); + void updateThumbnails(); void longPressTimeout(); void mousePressAndHoldEvent(QPoint pos);