From 3509b4481782384236c81ee1abe1a448fb9d25d8 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 26 Jul 2012 15:26:07 +0200 Subject: [PATCH] Fixed issue 661 and 662 --- src/core/UBApplicationController.cpp | 5 ++++- src/desktop/UBDesktopAnnotationController.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 48b80f02..a57622a8 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -586,7 +586,10 @@ void UBApplicationController::checkUpdateRequest() void UBApplicationController::hideDesktop() { mDisplayManager->adjustScreens(-1); - UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector); + + if(UBStylusTool::Eraser != UBDrawingController::drawingController()->stylusTool()){ + UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector); + } if (mMainMode == Board) { diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 7c951c99..ddfce593 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -386,7 +386,10 @@ void UBDesktopAnnotationController::goToUniboard() UBPlatformUtils::setDesktopMode(false); UBDrawingController::drawingController()->setInDestopMode(false); - UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector); + + if(UBStylusTool::Eraser != UBDrawingController::drawingController()->stylusTool()){ + UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector); + } emit restoreUniboard(); }