|
|
@ -51,6 +51,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) |
|
|
|
, mTransparentDrawingView(0) |
|
|
|
, mTransparentDrawingView(0) |
|
|
|
, mTransparentDrawingScene(0) |
|
|
|
, mTransparentDrawingScene(0) |
|
|
|
, mDesktopPalette(NULL) |
|
|
|
, mDesktopPalette(NULL) |
|
|
|
|
|
|
|
, mKeyboardPalette(0) |
|
|
|
, mDesktopToolsPalette(NULL) |
|
|
|
, mDesktopToolsPalette(NULL) |
|
|
|
, mDesktopPenPalette(NULL) |
|
|
|
, mDesktopPenPalette(NULL) |
|
|
|
, mDesktopMarkerPalette(NULL) |
|
|
|
, mDesktopMarkerPalette(NULL) |
|
|
@ -65,7 +66,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) |
|
|
|
, mbArrowClicked(false) |
|
|
|
, mbArrowClicked(false) |
|
|
|
, mBoardStylusTool(UBStylusTool::Pen) |
|
|
|
, mBoardStylusTool(UBStylusTool::Pen) |
|
|
|
, mDesktopStylusTool(UBStylusTool::Selector) |
|
|
|
, mDesktopStylusTool(UBStylusTool::Selector) |
|
|
|
, mKeyboardPalette(0) |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
mTransparentDrawingView = new UBBoardView(UBApplication::boardController, 0); // deleted in UBDesktopAnnotationController::destructor
|
|
|
|
mTransparentDrawingView = new UBBoardView(UBApplication::boardController, 0); // deleted in UBDesktopAnnotationController::destructor
|
|
|
@ -385,7 +385,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool) |
|
|
|
if(eTool != UBStylusTool::Selector && eTool != UBStylusTool::Text) |
|
|
|
if(eTool != UBStylusTool::Selector && eTool != UBStylusTool::Text) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if(mKeyboardPalette->m_isVisible) |
|
|
|
if(mKeyboardPalette->m_isVisible) |
|
|
|
UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger); |
|
|
|
UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
updateBackground(); |
|
|
|
updateBackground(); |
|
|
|