From 816bfaa42873a704a89c035a3f120d055dd69465 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 10 Sep 2012 18:30:51 +0300 Subject: [PATCH 1/3] Fixed changing mode from desktop to board. --- src/core/UBApplicationController.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index c0f9918a..c711184b 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -595,7 +595,7 @@ void UBApplicationController::checkUpdateRequest() void UBApplicationController::hideDesktop() { - mDisplayManager->adjustScreens(-1); + if(UBStylusTool::Eraser != UBDrawingController::drawingController()->stylusTool()){ UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector); @@ -623,6 +623,9 @@ void UBApplicationController::hideDesktop() } mIsShowingDesktop = false; + + mDisplayManager->adjustScreens(-1); + emit desktopMode(false); } From 76b2d83bc2b493c97ad963431b4615e81bdf8909 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 11 Sep 2012 11:23:58 +0300 Subject: [PATCH 2/3] Fixed adding lines to stroke groups. --- src/domain/UBGraphicsScene.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 352d0f2a..2ac7e581 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -742,6 +742,9 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth, // Here we add the item to the scene addItem(polygonItem); + if (!mCurrentStroke) + mCurrentStroke = new UBGraphicsStroke(); + if (mCurrentStroke) { polygonItem->setStroke(mCurrentStroke); From 1f83f35176b6bf7d89fc8fd13212c82997bcf66e Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 11 Sep 2012 12:52:22 +0300 Subject: [PATCH 3/3] Fixed writing a lines with Marker. --- src/domain/UBGraphicsScene.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 2ac7e581..48929e63 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -477,6 +477,7 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres if (currentTool == UBStylusTool::Line || dc->mActiveRuler) { + if (UBDrawingController::drawingController()->stylusTool() != UBStylusTool::Marker) if(NULL != mpLastPolygon && NULL != mCurrentStroke && mAddedItems.size() > 0){ UBCoreGraphicsScene::removeItemFromDeletion(mpLastPolygon); mAddedItems.remove(mpLastPolygon);