diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 372b6e82..03597682 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -88,6 +88,7 @@ UBBoardController::UBBoardController(UBMainWindow* mainWindow) , mIsClosing(false) , mSystemScaleFactor(1.0) , mCleanupDone(false) + , mCacheWidgetIsEnabled(false) { mZoomFactor = UBSettings::settings()->boardZoomFactor->get().toDouble(); @@ -399,6 +400,11 @@ void UBBoardController::stopScript() freezeW3CWidgets(true); } +bool UBBoardController::cacheIsVisible() +{ + return mCacheWidgetIsEnabled; +} + void UBBoardController::initToolbarTexts() { QList allToolbarActions; @@ -1685,6 +1691,8 @@ void UBBoardController::notifyCache(bool visible) { emit cacheDisabled(); } + + mCacheWidgetIsEnabled = visible; } void UBBoardController::updatePageSizeState() diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h index 2254cd96..2c8dcf26 100644 --- a/src/board/UBBoardController.h +++ b/src/board/UBBoardController.h @@ -222,6 +222,7 @@ class UBBoardController : public QObject void freezeW3CWidget(QGraphicsItem* item, bool freeze); void startScript(); void stopScript(); + bool cacheIsVisible(); signals: void newPageAdded(); @@ -282,6 +283,7 @@ class UBBoardController : public QObject qreal mSystemScaleFactor; bool mCleanupDone; QMap > mActionTexts; + bool mCacheWidgetIsEnabled; private slots: void stylusToolDoubleClicked(int tool); diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 36604968..1e347acc 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -729,7 +729,8 @@ void UBBoardView::mousePressEvent (QMouseEvent *event) movingItem = scene()->itemAt(this->mapToScene(event->posF().toPoint())); connect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent())); - mLongPressTimer.start(); + if (!movingItem && !mController->cacheIsVisible()) + mLongPressTimer.start(); if (!movingItem) { // Rubberband selection implementation