From efc09b98a29011ece907a64c455ca670d2a5acce Mon Sep 17 00:00:00 2001
From: Ivan Ilin <ilin@scand.com>
Date: Tue, 6 Sep 2011 12:53:12 +0300
Subject: [PATCH] Fixed .pro file and simple bug in linux desktop mode

---
 Sankore_3.1.pro                               | 2 +-
 src/desktop/UBDesktopAnnotationController.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 722a9f79..91996b09 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -110,7 +110,7 @@ win32 {
    QMAKE_CXXFLAGS_RELEASE += /Od \
        /Zi
    QMAKE_LFLAGS_RELEASE += /DEBUG
-   UB_LIBRARY.path = DESTDIR
+   UB_LIBRARY.path = $$DESTDIR
    UB_I18N.path = $$DESTDIR/i18n
    UB_ETC.path = $$DESTDIR
    UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index ca70f989..3af00596 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -855,7 +855,11 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent)
 void UBDesktopAnnotationController::refreshMask()
 {
     if(mIsFullyTransparent
-            || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Selector)
+            || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Selector
+            || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Eraser
+            || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Pointer
+            || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Pen
+            || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Marker)
     {
         updateMask(true);
     }