Feat: snap to grid

resources/etc/OpenBoard.config

@@ -1,5 +1,4 @@
 [App]
-AngleTolerance=4
 HideCheckForSoftwareUpdate=false
 HideSwapDisplayScreens=true
 EnableAutomaticSoftwareUpdates=true
@@ -12,6 +11,7 @@ LastSessionPageIndex=0
 PageCacheSize=20
 PreferredLanguage=fr_CH
 ProductWebAddress=http://www.openboard.ch
+RotationAngleStep=5.
 RunInWindow=false
 SoftwareUpdateURL=http://www.openboard.ch/update.json
 StartMode=

src/board/UBBoardController.cpp

@@ -299,35 +299,48 @@ void UBBoardController::setBoxing(QRect displayRect)
     }
 }
 
-void UBBoardController::setCursorFromAngle(QString angle)
+void UBBoardController::setCursorFromAngle(QString angle, const QPoint offset)
 {
         QWidget *controlViewport = controlView()->viewport();
 
         QSize cursorSize(45,30);
+        QSize bitmapSize = cursorSize;
+        int hotX = -1;
+        int hotY = -1;
 
-        QImage mask_img(cursorSize, QImage::Format_Mono);
+        if (!offset.isNull())
+        {
+            bitmapSize.setWidth(std::max(bitmapSize.width(), 2 * std::abs(offset.x())));
+            bitmapSize.setHeight(std::max(bitmapSize.height(), 2 * std::abs(offset.y())));
+            hotX = bitmapSize.width() / 2 - offset.x();
+            hotY = bitmapSize.height() / 2 - offset.y();
+        }
+
+        QSize origin = (bitmapSize - cursorSize) / 2;
+
+        QImage mask_img(bitmapSize, QImage::Format_Mono);
         mask_img.fill(0xff);
         QPainter mask_ptr(&mask_img);
         mask_ptr.setBrush( QBrush( QColor(0, 0, 0) ) );
-        mask_ptr.drawRoundedRect(0,0, cursorSize.width()-1, cursorSize.height()-1, 6, 6);
+        mask_ptr.drawRoundedRect(origin.width(), origin.height(), cursorSize.width()-1, cursorSize.height()-1, 6, 6);
         QBitmap bmpMask = QBitmap::fromImage(mask_img);
 
 
-        QPixmap pixCursor(cursorSize);
+        QPixmap pixCursor(bitmapSize);
         pixCursor.fill(QColor(Qt::white));
 
         QPainter painter(&pixCursor);
 
         painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
         painter.setBrush(QBrush(Qt::white));
         painter.setPen(QPen(QColor(Qt::black)));
-        painter.drawRoundedRect(1,1,cursorSize.width()-2,cursorSize.height()-2,6,6);
+        painter.drawRoundedRect(origin.width() + 1, origin.height() + 1,cursorSize.width()-2,cursorSize.height()-2,6,6);
         painter.setFont(QFont("Arial", 10));
-        painter.drawText(1,1,cursorSize.width(),cursorSize.height(), Qt::AlignCenter, angle.append(QChar(176)));
+        painter.drawText(origin.width() + 1, origin.height() + 1,cursorSize.width(),cursorSize.height(), Qt::AlignCenter, angle.append(QChar(176)));
         painter.end();
 
         pixCursor.setMask(bmpMask);
-        controlViewport->setCursor(QCursor(pixCursor));
+        controlViewport->setCursor(QCursor(pixCursor, hotX, hotY));
 }
 
 

src/board/UBBoardController.h

@@ -165,7 +165,7 @@ class UBBoardController : public UBDocumentContainer
         void persistCurrentScene(bool isAnAutomaticBackup = false, bool forceImmediateSave = false);
         void showNewVersionAvailable(bool automatic, const UBVersion &installedVersion, const UBSoftwareUpdate &softwareUpdate);
         void setBoxing(QRect displayRect);
-        void setCursorFromAngle(QString angle);
+        void setCursorFromAngle(QString angle, const QPoint offset = {});
         void setToolbarTexts();
         static QUrl expandWidgetToTempDir(const QByteArray& pZipedData, const QString& pExtension = QString("wgt"));
 

src/board/UBBoardView.cpp

@@ -53,6 +53,7 @@
 #include "gui/UBToolWidget.h"
 #include "gui/UBResources.h"
 #include "gui/UBMainWindow.h"
+#include "gui/UBSnapIndicator.h"
 #include "gui/UBThumbnailWidget.h"
 
 #include "board/UBBoardController.h"
@@ -391,13 +392,13 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
     switch (event->type ()) {
     case QEvent::TabletPress: {
         mTabletStylusIsPressed = true;
-        scene()->inputDevicePress (scenePos, pressure);
+        scene()->inputDevicePress (scenePos, pressure, event->modifiers());
 
         break;
     }
     case QEvent::TabletMove: {
         if (mTabletStylusIsPressed)
-            scene ()->inputDeviceMove (scenePos, pressure);
+            scene ()->inputDeviceMove (scenePos, pressure, event->modifiers());
 
         acceptEvent = false; // rerouted to mouse move
 
@@ -409,7 +410,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
         scene ()->setToolCursor (currentTool);
         setToolCursor (currentTool);
 
-        scene ()->inputDeviceRelease ();
+        scene ()->inputDeviceRelease (currentTool, event->modifiers());
 
         mPendingStylusReleaseEvent = false;
 
@@ -693,9 +694,9 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
     case UBGraphicsMediaItem::Type:
     case UBGraphicsVideoItem::Type:
     case UBGraphicsAudioItem::Type:
+    case UBGraphicsStrokesGroup::Type:
         return true;
 
-    case UBGraphicsStrokesGroup::Type:
     case UBGraphicsTextItem::Type:
         if (currentTool == UBStylusTool::Play)
             return true;
@@ -842,9 +843,32 @@ void UBBoardView::handleItemMouseMove(QMouseEvent *event)
     if (getMovingItem() && itemShouldBeMoved(getMovingItem()) && (mMouseButtonIsPressed || mTabletStylusIsPressed))
     {
         QPointF scenePos = mapToScene(event->pos());
-        QPointF newPos = getMovingItem()->pos() + scenePos - mLastPressedMousePos;
-        getMovingItem()->setPos(newPos);
-        mLastPressedMousePos = scenePos;
+        auto movingItem = getMovingItem();
+        QPointF newPos = movingItem->pos() + scenePos - mLastPressedMousePos;
+        movingItem->setPos(newPos);
+
+        // snap to grid
+        if (event->modifiers().testFlag(Qt::ShiftModifier))
+        {
+            QRectF rect = UBGraphicsScene::itemRect(movingItem);
+            Qt::Corner corner;
+            auto offset = scene()->snap(rect, &corner);
+            newPos += offset;
+            movingItem->setPos(newPos);
+
+            mLastPressedMousePos = scenePos + offset;
+
+            // display snap indicator
+            if (!offset.isNull())
+            {
+                updateSnapIndicator(corner);
+            }
+        }
+        else
+        {
+            mLastPressedMousePos = scenePos;
+        }
+
         mWidgetMoved = true;
         event->accept();
     }
@@ -924,6 +948,17 @@ void UBBoardView::setMultiselection(bool enable)
     mMultipleSelectionIsEnabled = enable;
 }
 
+void UBBoardView::updateSnapIndicator(Qt::Corner corner)
+{
+    if (!mSnapIndicator)
+    {
+        mSnapIndicator = new UBSnapIndicator(this);
+        mSnapIndicator->resize(60, 60);
+    }
+
+    mSnapIndicator->appear(corner);
+}
+
 void UBBoardView::setBoxing(const QMargins& margins)
 {
     mMargins = margins;
@@ -1052,7 +1087,7 @@ void UBBoardView::mousePressEvent (QMouseEvent *event)
         return;
     }
 
-    setMultiselection(event->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier));
+    setMultiselection(event->modifiers() & Qt::ControlModifier);
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     QPointF eventPosition = event->position();
@@ -1146,7 +1181,7 @@ void UBBoardView::mousePressEvent (QMouseEvent *event)
                     connect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent()));
                     mLongPressTimer.start();
                 }
-                scene()->inputDevicePress(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())));
+                scene()->inputDevicePress(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())), 1., event->modifiers());
             }
             event->accept ();
         }
@@ -1311,7 +1346,7 @@ void UBBoardView::mouseMoveEvent (QMouseEvent *event)
 
     default:
         if (!mTabletStylusIsPressed && scene()) {
-            scene()->inputDeviceMove(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())) , mMouseButtonIsPressed);
+            scene()->inputDeviceMove(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())) , mMouseButtonIsPressed, event->modifiers());
         }
         event->accept ();
     }
@@ -1333,7 +1368,7 @@ void UBBoardView::mouseReleaseEvent (QMouseEvent *event)
     setToolCursor (currentTool);
     // first/ propagate device release to the scene
     if (scene())
-        scene()->inputDeviceRelease();
+        scene()->inputDeviceRelease(currentTool, event->modifiers());
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     QPointF eventPosition = event->position();

src/board/UBBoardView.h

@@ -42,6 +42,7 @@ class UBBoardController;
 class UBGraphicsScene;
 class UBGraphicsWidgetItem;
 class UBRubberBand;
+class UBSnapIndicator;
 
 class UBBoardView : public QGraphicsView
 {
@@ -66,6 +67,7 @@ class UBBoardView : public QGraphicsView
     bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; }
 
     void setBoxing(const QMargins& margins);
+    void updateSnapIndicator(Qt::Corner corner);
 
     // work around for handling tablet events on MAC OS with Qt 4.8.0 and above
 #if defined(Q_OS_OSX)
@@ -208,6 +210,7 @@ class UBBoardView : public QGraphicsView
     bool mRubberBandInPlayMode;
 
     QMargins mMargins{};
+    UBSnapIndicator* mSnapIndicator{nullptr};
 
     static bool hasSelectedParents(QGraphicsItem * item);
 

src/core/UBSettings.cpp

@@ -468,7 +468,7 @@ void UBSettings::init()
     KeyboardLocale = new UBSetting(this, "Board", "StartupKeyboardLocale", 0);
     swapControlAndDisplayScreens = new UBSetting(this, "App", "SwapControlAndDisplayScreens", false);
 
-    angleTolerance = new UBSetting(this, "App", "AngleTolerance", 4);
+    rotationAngleStep = new UBSetting(this, "App", "RotationAngleStep", 5.);
     historyLimit = new UBSetting(this, "Web", "HistoryLimit", 15);
 
     libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize);

src/core/UBSettings.h

@@ -417,7 +417,7 @@ class UBSettings : public QObject
         UBSetting* KeyboardLocale;
         UBSetting* swapControlAndDisplayScreens;
 
-        UBSetting* angleTolerance;
+        UBSetting* rotationAngleStep;
         UBSetting* historyLimit;
 
         UBSetting* libIconSize;