Fix being able to create guides when Guides Locked is checked

Closes #54
mitchcurtis · Jun 8, 2018 · 6fe9a3a · 6fe9a3a
1 parent 63bccdf
commit 6fe9a3a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/app/imagecanvas.cpp b/app/imagecanvas.cpp
@@ -1059,7 +1059,7 @@ void ImageCanvas::resizeRulers()
 
 void ImageCanvas::updatePressedRuler()
 {
-    mPressedRuler = rulerAtCursorPos();
+    mPressedRuler = !guidesLocked() ? rulerAtCursorPos() : nullptr;
 }
 
 Ruler *ImageCanvas::rulerAtCursorPos()

diff --git a/tests/testhelper.cpp b/tests/testhelper.cpp
@@ -68,6 +68,8 @@ void TestHelper::initTestCase()
     QVERIFY(app.settings()->isGridVisible());
     app.settings()->setRulersVisible(false);
     QVERIFY(!app.settings()->areRulersVisible());
+    app.settings()->setGuidesLocked(false);
+    QVERIFY(!app.settings()->areGuidesLocked());
 
     // However, this should never change.
     QVERIFY(!app.settings()->loadLastOnStartup());

diff --git a/tests/tst_app.cpp b/tests/tst_app.cpp
@@ -3134,6 +3134,25 @@ void tst_App::rulersAndGuides()
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, cursorWindowPos);
     QCOMPARE(project->guides().isEmpty(), true);
     QCOMPARE(window->cursor().shape(), Qt::ArrowCursor);
+
+    // Shouldn't be possible to create a guide when Guides Locked is checked.
+    app.settings()->setGuidesLocked(true);
+
+    // Try to drag a guide out.
+    setCursorPosInPixels(QPoint(50, rulerThickness / 2));
+    QTest::mouseMove(window, cursorWindowPos);
+    QVERIFY(!canvas->pressedRuler());
+
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, cursorWindowPos);
+    QVERIFY(!canvas->pressedRuler());
+
+    setCursorPosInPixels(QPoint(50, rulerThickness + 10));
+    QTest::mouseMove(window, cursorWindowPos);
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, cursorWindowPos);
+    QVERIFY(!canvas->pressedRuler());
+    QCOMPARE(project->guides().size(), 0);
+
+    app.settings()->setGuidesLocked(false);
 }
 
 void tst_App::recentFiles()