Fixed issue 661 and 662

3509b448 · shibakaneki · b34926f7 · 3509b448 · 3509b448
Commit 3509b448 authored Jul 26, 2012 by shibakaneki
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

UBApplicationController.cpp src/core/UBApplicationController.cpp +4 -1

UBDesktopAnnotationController.cpp src/desktop/UBDesktopAnnotationController.cpp +4 -1

No files found.
--- 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)
    {

--- 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();
 }