Grid and snapping #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

pgilfernandez wants to merge 37 commits into friction2d:main from pgilfernandez:grids-v01

src/app/GUI/canvaswindow.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ @@
     #include <QComboBox>
     #include <QApplication>
+    #include <QTransform>
     #include "mainwindow.h"
     #include "GUI/BoxesList/boxscroller.h"
@@ Expand Down Expand Up / @@ -173,6 +174,10 @@ void CanvasWindow::renderSk(SkCanvas * const canvas) @@
     {
         qreal pixelRatio = this->devicePixelRatioF();
         if (mCurrentCanvas) {
+            const QTransform worldToScreen(mViewTransform.m11(), mViewTransform.m12(), 0.0,
+                                           mViewTransform.m21(), mViewTransform.m22(), 0.0,
+                                           mViewTransform.dx(), mViewTransform.dy(), 1.0);
+            mCurrentCanvas->setWorldToScreen(worldToScreen, pixelRatio);
             canvas->save();
             mCurrentCanvas->renderSk(canvas,
                                      rect(),
@@ Expand Down @@

src/app/GUI/mainwindow.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ @@
     #include <iostream>
     #include <QClipboard>
     #include <QMimeData>
+    #include <QSignalBlocker>
     #include "GUI/edialogs.h"
     #include "dialogs/applyexpressiondialog.h"
@@ Expand Down Expand Up / @@ -76,6 +77,7 @@ @@
     #include "widgets/assetswidget.h"
     #include "dialogs/adjustscenedialog.h"
     #include "dialogs/commandpalette.h"
+    #include "dialogs/gridsettingsdialog.h"
     using namespace Friction;
@@ Expand Down Expand Up / @@ -117,6 +119,18 @@ MainWindow::MainWindow(Document& document, @@
         , mInvertSelAct(nullptr)
         , mClearSelAct(nullptr)
         , mAddKeyAct(nullptr)
+        , mShowGridAct(nullptr)
+        , mSnappingAct(nullptr)
+        , mSnapToGridAct(nullptr)
+        , mSnapToCanvasAct(nullptr)
+        , mSnapToBoxesAct(nullptr)
+        , mSnapToNodesAct(nullptr)
+        , mSnapToPivotsAct(nullptr)
+        , mSnapAnchorPivotAct(nullptr)
+        , mSnapAnchorBoundsAct(nullptr)
+        , mSnapAnchorNodesAct(nullptr)
+        , mGridSettingsAct(nullptr)
+        , mGridDrawOnTopAct(nullptr)
         , mAddToQueAct(nullptr)
         , mViewFullScreenAct(nullptr)
         , mFontWidget(nullptr)
@@ Expand Down Expand Up / @@ -160,6 +174,13 @@ MainWindow::MainWindow(Document& document, @@
         Q_ASSERT(!sInstance);
         sInstance = this;
+        connect(&mDocument, &Document::gridSettingsChanged,
+                this, &MainWindow::onGridSettingsChanged);
+        connect(&mDocument, &Document::gridSnapEnabledChanged,
+                this, &MainWindow::onGridSnapEnabledChanged);
+        connect(&mDocument, &Document::snappingActiveChanged,
+                this, &MainWindow::onSnappingActiveChanged);
         setWindowIcon(QIcon::fromTheme(AppSupport::getAppID()));
         setContextMenuPolicy(Qt::NoContextMenu);
@@ Expand Down Expand Up / @@ -208,6 +229,109 @@ BoundingBox *MainWindow::getCurrentBox() @@
         return box;
     }
+    void MainWindow::openGridSettingsDialog()
+    {
+        auto dialog = new GridSettingsDialog(this);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->setWindowTitle(tr("Grid Settings"));
+        dialog->setSettings(mDocument.gridController().settings);
+        connect(dialog, &GridSettingsDialog::applyRequested,
+                this, [this](Friction::Core::GridSettings settings, bool saveDefaults) {
+                    settings.enabled = mDocument.gridController().settings.enabled;
+                    mDocument.setGridSettings(settings);
+                    if (saveDefaults) {
+                        mDocument.saveGridSettingsAsDefault(mDocument.gridController().settings);
+                    }
+                });
+        connect(dialog, &QDialog::accepted,
+                this, [this, dialog]() {
+                    auto settings = dialog->settings();
+                    settings.enabled = mDocument.gridController().settings.enabled;
+                    mDocument.setGridSettings(settings);
+                    if (dialog->saveAsDefault()) {
+                        mDocument.saveGridSettingsAsDefault(mDocument.gridController().settings);
+                    }
+                });
+        dialog->show();
+    }
+    void MainWindow::onGridSettingsChanged(const Friction::Core::GridSettings& settings)
+    {
+        onGridSnapEnabledChanged(settings.enabled);
+        if (mShowGridAct) {
+            QSignalBlocker blocker(mShowGridAct);
+            if (mShowGridAct->isChecked() != settings.show) {
+                mShowGridAct->setChecked(settings.show);
+            }
+        }
+        if (mSnapToCanvasAct) {
+            QSignalBlocker blocker(mSnapToCanvasAct);
+            if (mSnapToCanvasAct->isChecked() != settings.snapToCanvas) {
+                mSnapToCanvasAct->setChecked(settings.snapToCanvas);
+            }
+        }
+        if (mSnapToBoxesAct) {
+            QSignalBlocker blocker(mSnapToBoxesAct);
+            if (mSnapToBoxesAct->isChecked() != settings.snapToBoxes) {
+                mSnapToBoxesAct->setChecked(settings.snapToBoxes);
+            }
+        }
+        if (mSnapToNodesAct) {
+            QSignalBlocker blocker(mSnapToNodesAct);
+            if (mSnapToNodesAct->isChecked() != settings.snapToNodes) {
+                mSnapToNodesAct->setChecked(settings.snapToNodes);
+            }
+        }
+        if (mSnapToPivotsAct) {
+            QSignalBlocker blocker(mSnapToPivotsAct);
+            if (mSnapToPivotsAct->isChecked() != settings.snapToPivots) {
+                mSnapToPivotsAct->setChecked(settings.snapToPivots);
+            }
+        }
+        if (mSnapAnchorPivotAct) {
+            QSignalBlocker blocker(mSnapAnchorPivotAct);
+            if (mSnapAnchorPivotAct->isChecked() != settings.snapAnchorPivot) {
+                mSnapAnchorPivotAct->setChecked(settings.snapAnchorPivot);
+            }
+        }
+        if (mSnapAnchorBoundsAct) {
+            QSignalBlocker blocker(mSnapAnchorBoundsAct);
+            if (mSnapAnchorBoundsAct->isChecked() != settings.snapAnchorBounds) {
+                mSnapAnchorBoundsAct->setChecked(settings.snapAnchorBounds);
+            }
+        }
+        if (mSnapAnchorNodesAct) {
+            QSignalBlocker blocker(mSnapAnchorNodesAct);
+            if (mSnapAnchorNodesAct->isChecked() != settings.snapAnchorNodes) {
+                mSnapAnchorNodesAct->setChecked(settings.snapAnchorNodes);
+            }
+        }
+        if (mGridDrawOnTopAct) {
+            QSignalBlocker blocker(mGridDrawOnTopAct);
+            if (mGridDrawOnTopAct->isChecked() != settings.drawOnTop) {
+                mGridDrawOnTopAct->setChecked(settings.drawOnTop);
+            }
+        }
+    }
+    void MainWindow::onGridSnapEnabledChanged(bool enabled)
+    {
+        if (!mSnapToGridAct) { return; }
+        QSignalBlocker blocker(mSnapToGridAct);
+        if (mSnapToGridAct->isChecked() != enabled) {
+            mSnapToGridAct->setChecked(enabled);
+        }
+    }
+    void MainWindow::onSnappingActiveChanged(bool active)
+    {
+        if (!mSnappingAct) { return; }
+        QSignalBlocker blocker(mSnappingAct);
+        if (mSnappingAct->isChecked() != active) {
+            mSnappingAct->setChecked(active);
+        }
+    }
     void MainWindow::checkAutoSaveTimer()
     {
         if (mShutdown) { return; }
@@ Expand Down @@

src/app/GUI/mainwindow.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ @@
     #include "window.h"
     #include "GUI/RenderWidgets/renderwidget.h"
     #include "gizmos.h"
+    #include "gridcontroller.h"
     #include "widgets/fontswidget.h"
     #include "widgets/toolbar.h"
@@ Expand Down Expand Up / @@ -198,6 +199,10 @@ class MainWindow : public QMainWindow @@
         void openWelcomeDialog();
         void closeWelcomeDialog();
+        void openGridSettingsDialog();
+        void onGridSettingsChanged(const Friction::Core::GridSettings& settings);
+        void onGridSnapEnabledChanged(bool enabled);
+        void onSnappingActiveChanged(bool active);
         eKeyFilter* mNumericFilter = eKeyFilter::sCreateNumberFilter(this);
         eKeyFilter* mLineFilter = eKeyFilter::sCreateLineFilter(this);
@@ Expand Down Expand Up / @@ -255,6 +260,18 @@ class MainWindow : public QMainWindow @@
         QAction *mZoomInAction;
         QAction *mZoomOutAction;
         QAction *mFitViewAction;
+        QAction *mShowGridAct;
+        QAction *mSnappingAct;
+        QAction *mSnapToGridAct;
+        QAction *mSnapToCanvasAct;
+        QAction *mSnapToBoxesAct;
+        QAction *mSnapToNodesAct;
+        QAction *mSnapToPivotsAct;
+        QAction *mSnapAnchorPivotAct;
+        QAction *mSnapAnchorBoundsAct;
+        QAction *mSnapAnchorNodesAct;
+        QAction *mGridSettingsAct;
+        QAction *mGridDrawOnTopAct;
         QAction *mNoneQuality;
         QAction *mLowQuality;
@@ Expand Down Expand Up / @@ -282,6 +299,7 @@ class MainWindow : public QMainWindow @@
         QMenu *mEffectsMenu;
         QMenu *mSceneMenu;
         QMenu *mViewMenu;
+        QMenu *mGridMenu;
         QMenu *mPanelsMenu;
         QMenu *mRenderMenu;
@@ Expand Down @@

src/app/GUI/menu.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -566,6 +566,134 @@ void MainWindow::setupMenuBar() @@
                 });
         cmdAddAction(mResetZoomAction);
+        mGridMenu = mViewMenu->addMenu(QIcon::fromTheme("grid"),
+                                      tr("Grid && Snapping", "MenuBar_View"));
+        mSnappingAct = mGridMenu->addAction(tr("Snapping"));
+        mSnappingAct->setCheckable(true);
+        mSnappingAct->setChecked(mDocument.isSnappingActive());
+        connect(mSnappingAct, &QAction::toggled, this, [this](bool checked) {
+            mDocument.setSnappingActive(checked);
+        });
+        cmdAddAction(mSnappingAct);
+        mGridMenu->addSeparator();
+        mSnapToCanvasAct = mGridMenu->addAction(tr("Snap to Canvas"));
+        mSnapToCanvasAct->setCheckable(true);
+        mSnapToCanvasAct->setChecked(mDocument.gridController().settings.snapToCanvas);
+        connect(mSnapToCanvasAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapToCanvas == checked) { return; }
+            settings.snapToCanvas = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapToCanvasAct);
+        mSnapToGridAct = mGridMenu->addAction(tr("Snap to Grid"));
+        mSnapToGridAct->setCheckable(true);
+        mSnapToGridAct->setChecked(mDocument.gridController().settings.enabled);
+        connect(mSnapToGridAct, &QAction::toggled, this, [this](bool checked) {
+            mDocument.setGridSnapEnabled(checked);
+        });
+        cmdAddAction(mSnapToGridAct);
+        mSnapToPivotsAct = mGridMenu->addAction(tr("Snap to Pivots"));
+        mSnapToPivotsAct->setCheckable(true);
+        mSnapToPivotsAct->setChecked(mDocument.gridController().settings.snapToPivots);
+        connect(mSnapToPivotsAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapToPivots == checked) { return; }
+            settings.snapToPivots = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapToPivotsAct);
+        mSnapToBoxesAct = mGridMenu->addAction(tr("Snap to Boxes"));
+        mSnapToBoxesAct->setCheckable(true);
+        mSnapToBoxesAct->setChecked(mDocument.gridController().settings.snapToBoxes);
+        connect(mSnapToBoxesAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapToBoxes == checked) { return; }
+            settings.snapToBoxes = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapToBoxesAct);
+        mSnapToNodesAct = mGridMenu->addAction(tr("Snap to Nodes"));
+        mSnapToNodesAct->setCheckable(true);
+        mSnapToNodesAct->setChecked(mDocument.gridController().settings.snapToNodes);
+        connect(mSnapToNodesAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapToNodes == checked) { return; }
+            settings.snapToNodes = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapToNodesAct);
+        mGridMenu->addSeparator();
+        mSnapAnchorPivotAct = mGridMenu->addAction(tr("Pivot anchor"));
+        mSnapAnchorPivotAct->setCheckable(true);
+        mSnapAnchorPivotAct->setChecked(mDocument.gridController().settings.snapAnchorPivot);
+        connect(mSnapAnchorPivotAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapAnchorPivot == checked) { return; }
+            settings.snapAnchorPivot = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapAnchorPivotAct);
+        mSnapAnchorBoundsAct = mGridMenu->addAction(tr("Boxes anchors"));
+        mSnapAnchorBoundsAct->setCheckable(true);
+        mSnapAnchorBoundsAct->setChecked(mDocument.gridController().settings.snapAnchorBounds);
+        connect(mSnapAnchorBoundsAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapAnchorBounds == checked) { return; }
+            settings.snapAnchorBounds = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapAnchorBoundsAct);
+        mSnapAnchorNodesAct = mGridMenu->addAction(tr("Nodes anchors"));
+        mSnapAnchorNodesAct->setCheckable(true);
+        mSnapAnchorNodesAct->setChecked(mDocument.gridController().settings.snapAnchorNodes);
+        connect(mSnapAnchorNodesAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.snapAnchorNodes == checked) { return; }
+            settings.snapAnchorNodes = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mSnapAnchorNodesAct);
+        mGridMenu->addSeparator();
+        mShowGridAct = mGridMenu->addAction(tr("Show Grid"));
+        mShowGridAct->setCheckable(true);
+        mShowGridAct->setChecked(mDocument.gridController().settings.show);
+        connect(mShowGridAct, &QAction::toggled, this, [this](bool checked) {
+            mDocument.setGridVisible(checked);
+        });
+        cmdAddAction(mShowGridAct);
+        mGridDrawOnTopAct = mGridMenu->addAction(tr("Grid on top"));
+        mGridDrawOnTopAct->setCheckable(true);
+        connect(mGridDrawOnTopAct, &QAction::toggled, this, [this](bool checked) {
+            auto settings = mDocument.gridController().settings;
+            if (settings.drawOnTop == checked) { return; }
+            settings.drawOnTop = checked;
+            mDocument.setGridSettings(settings);
+        });
+        cmdAddAction(mGridDrawOnTopAct);
+        mGridMenu->addSeparator();
+        mGridSettingsAct = mGridMenu->addAction(tr("Grid Settings..."));
+        connect(mGridSettingsAct, &QAction::triggered, this, &MainWindow::openGridSettingsDialog);
+        cmdAddAction(mGridSettingsAct);
+        onGridSettingsChanged(mDocument.gridController().settings);
         const auto filteringMenu = mViewMenu->addMenu(QIcon::fromTheme("user-desktop"),
                                                       tr("Filtering", "MenuBar_View"));
@@ Expand Down @@

src/core/CMakeLists.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ include_directories( @@
     set(
         SOURCES
         appsupport.cpp
+        gridcontroller.cpp
         Boxes/nullobject.cpp
         Expressions/expression.cpp
         Expressions/expressionpresets.cpp
@@ Expand Down Expand Up / @@ -359,6 +360,7 @@ set( @@
     set(
         HEADERS
         appsupport.h
+        gridcontroller.h
         Boxes/nullobject.h
         Expressions/expression.h
         Expressions/expressionpresets.h
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Grid and snapping #628

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!