Fixed .pro file and simple bug in linux desktop mode

preferencesAboutTextFull
Ivan Ilin 13 years ago
parent 3bd44ffc16
commit efc09b98a2
  1. 2
      Sankore_3.1.pro
  2. 6
      src/desktop/UBDesktopAnnotationController.cpp

@ -110,7 +110,7 @@ win32 {
QMAKE_CXXFLAGS_RELEASE += /Od \ QMAKE_CXXFLAGS_RELEASE += /Od \
/Zi /Zi
QMAKE_LFLAGS_RELEASE += /DEBUG QMAKE_LFLAGS_RELEASE += /DEBUG
UB_LIBRARY.path = DESTDIR UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR UB_ETC.path = $$DESTDIR
UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library

@ -855,7 +855,11 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent)
void UBDesktopAnnotationController::refreshMask() void UBDesktopAnnotationController::refreshMask()
{ {
if(mIsFullyTransparent 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); updateMask(true);
} }

Loading…
Cancel
Save