Middle-button pan, persistent tool settings, Auto Select's foreground rule, the new icon (12.6b)

src/Document/EditorSession+Transform.cpp

@@ -85,12 +85,14 @@ void EditorSession::beginTransform(bool persistent)
 void EditorSession::setTransformAutoSelect(bool picks)
 {
     m_transformAutoSelect = picks;
+    ToolDefaults::set(picks, QStringLiteral("autoSelect"));
     notify();
 }
 
 void EditorSession::setShowsTransformControls(bool shows)
 {
     m_showsTransformControls = shows;
+    ToolDefaults::set(shows, QStringLiteral("transformControls"));
     notify();
 }
 

src/Document/EditorSession.cpp

@@ -318,6 +318,7 @@ void EditorSession::zoom(double value, std::optional<QPointF> anchor)
 void EditorSession::setShowsPixelGrid(bool shows)
 {
     m_showsPixelGrid = shows;
+    ToolDefaults::set(shows, QStringLiteral("pixelGrid"));
     notify();
 }
 

src/Document/EditorSession.h

@@ -12,6 +12,7 @@
 #include "Document/SelectionClipboard.h"
 #include "Document/SelectionEdits.h"
 #include "Document/SmudgeLiquify.h"
+#include "Document/ToolDefaults.h"
 #include "Document/DocumentHistory.h"
 #include "Document/EditorSession+Jobs.h"
 #include "Document/EditorSession+Model.h"
@@ -344,8 +345,8 @@ private:
 
     std::optional<TransformEdit> m_transformEdit;
     std::optional<TransformDuplicate> m_transformDuplicate;
-    bool m_transformAutoSelect = false;
-    bool m_showsTransformControls = true;
+    bool m_transformAutoSelect = ToolDefaults::boolean(QStringLiteral("autoSelect"), false);
+    bool m_showsTransformControls = ToolDefaults::boolean(QStringLiteral("transformControls"), true);
     bool m_locksTransformRatio = true;
     std::optional<BlendPreview> m_blendPreview;
     std::optional<QUuid> m_opacityEditLayerID;
@@ -358,18 +359,18 @@ private:
     std::optional<QString> m_importError;
     std::optional<QUuid> m_renamingLayerID;
     std::optional<QString> m_projectPath;
-    bool m_showsPixelGrid = true;
+    bool m_showsPixelGrid = ToolDefaults::boolean(QStringLiteral("pixelGrid"), true);
     bool m_snappingEnabled = true;
     // The layout grid starts off; guides show; rulers hide.
-    bool m_showsGrid = false;
-    bool m_showsGuides = true;
-    bool m_showsRulers = false;
-    bool m_snapEnabled = true;
-    bool m_snapToGuides = true;
-    bool m_snapToGrid = false;
-    bool m_snapToLayers = true;
-    bool m_snapToDocumentBounds = true;
-    bool m_locksGuides = false;
+    bool m_showsGrid = ToolDefaults::boolean(QStringLiteral("grid"), false);
+    bool m_showsGuides = ToolDefaults::boolean(QStringLiteral("guides"), true);
+    bool m_showsRulers = ToolDefaults::boolean(QStringLiteral("rulers"), false);
+    bool m_snapEnabled = ToolDefaults::boolean(QStringLiteral("snap"), true);
+    bool m_snapToGuides = ToolDefaults::boolean(QStringLiteral("snapGuides"), true);
+    bool m_snapToGrid = ToolDefaults::boolean(QStringLiteral("snapGrid"), false);
+    bool m_snapToLayers = ToolDefaults::boolean(QStringLiteral("snapLayers"), true);
+    bool m_snapToDocumentBounds = ToolDefaults::boolean(QStringLiteral("snapBounds"), true);
+    bool m_locksGuides = ToolDefaults::boolean(QStringLiteral("lockGuides"), false);
     std::optional<GuideDrag> m_guideDrag;
     bool m_showsSampleRing = true;
     std::optional<QRectF> m_cropRect;

src/Document/Guides.cpp

@@ -57,54 +57,63 @@ bool LayoutGrid::isMajor(double value)
 void EditorSession::setShowsGrid(bool shows)
 {
     m_showsGrid = shows;
+    ToolDefaults::set(shows, QStringLiteral("grid"));
     notify();
 }
 
 void EditorSession::setShowsGuides(bool shows)
 {
     m_showsGuides = shows;
+    ToolDefaults::set(shows, QStringLiteral("guides"));
     notify();
 }
 
 void EditorSession::setShowsRulers(bool shows)
 {
     m_showsRulers = shows;
+    ToolDefaults::set(shows, QStringLiteral("rulers"));
     notify();
 }
 
 void EditorSession::setSnapEnabled(bool enabled)
 {
     m_snapEnabled = enabled;
+    ToolDefaults::set(enabled, QStringLiteral("snap"));
     notify();
 }
 
 void EditorSession::setSnapToGuides(bool snaps)
 {
     m_snapToGuides = snaps;
+    ToolDefaults::set(snaps, QStringLiteral("snapGuides"));
     notify();
 }
 
 void EditorSession::setSnapToGrid(bool snaps)
 {
     m_snapToGrid = snaps;
+    ToolDefaults::set(snaps, QStringLiteral("snapGrid"));
     notify();
 }
 
 void EditorSession::setSnapToLayers(bool snaps)
 {
     m_snapToLayers = snaps;
+    ToolDefaults::set(snaps, QStringLiteral("snapLayers"));
     notify();
 }
 
 void EditorSession::setSnapToDocumentBounds(bool snaps)
 {
     m_snapToDocumentBounds = snaps;
+    ToolDefaults::set(snaps, QStringLiteral("snapBounds"));
     notify();
 }
 
 void EditorSession::setLocksGuides(bool locks)
 {
     m_locksGuides = locks;
+    ToolDefaults::set(locks, QStringLiteral("lockGuides"));
     notify();
 }
 
@@ -155,6 +164,7 @@ void EditorSession::beginGuideCreation(CanvasGuide::Axis axis, double position)
     if (!canEditGuides())
         return;
     m_showsGuides = true;
+    ToolDefaults::set(true, QStringLiteral("guides"));
     m_guideDrag = GuideDrag{QUuid::createUuid(), axis, snappedGuidePosition(position, axis, std::nullopt), true, std::nullopt};
     notify();
 }
@@ -225,6 +235,7 @@ void EditorSession::addGuide(const CanvasGuide &guide)
     if (!canEditGuides())
         return;
     m_showsGuides = true;
+    ToolDefaults::set(true, QStringLiteral("guides"));
     beginEdit(QStringLiteral("New Guide"));
     m_document->guides.push_back(guide);
     endEdit();

src/Document/ToolDefaults.cpp

@@ -0,0 +1,33 @@
+#include "Document/ToolDefaults.h"
+#include "Logging.h"
+#include <QSettings>
+
+namespace {
+const QString prefix = QStringLiteral("tool.");
+// Swift's XCTest check: only the app keeps the toggles.
+bool enabled = false;
+}
+
+void ToolDefaults::enable()
+{
+    enabled = true;
+}
+
+bool ToolDefaults::boolean(const QString &key, bool fallback)
+{
+    if (!enabled)
+        return fallback;
+    // The settings file keeps text; this run's writes are booleans.
+    const QString stored = QSettings().value(prefix + key).toString();
+    if (stored == QLatin1String("true") || stored == QLatin1String("false"))
+        return stored == QLatin1String("true");
+    if (!stored.isEmpty())
+        qCWarning(lcApp).noquote() << "ignoring the tool setting" << key << "of" << stored;
+    return fallback;
+}
+
+void ToolDefaults::set(bool value, const QString &key)
+{
+    if (enabled)
+        QSettings().setValue(prefix + key, value);
+}

src/Document/ToolDefaults.h

@@ -0,0 +1,11 @@
+#pragma once
+#include <QString>
+
+// Swift's ToolDefaults: toggles kept for the person, across launches.
+namespace ToolDefaults {
+// The app turns them on; tests keep the compiled defaults.
+void enable();
+// The stored toggle, else the fallback.
+bool boolean(const QString &key, bool fallback);
+void set(bool value, const QString &key);
+}