Merge branch 'main' into designer

Author: rodlie

.github/workflows/mac.yml

@@ -1,12 +1,12 @@
-name: macOS
+name: macOS (x86_64)
 
 on: workflow_dispatch
 
 jobs:
   release:
     runs-on: macos-13
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: ./src/scripts/build_mac_ci.sh
     - name: Artifact

.github/workflows/macos.yml

@@ -0,0 +1,16 @@
+name: macOS (arm64)
+
+on: [push, pull_request]
+
+jobs:
+  release:
+    runs-on: macos-15
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: ./src/scripts/build_mac_ci.sh
+    - name: Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: friction-ci-macOS-arm64
+        path: build-release/*.dmg

.gitignore

@@ -35,4 +35,5 @@ src/scripts/flatpak/export
 src/scripts/flatpak/builder
 src/scripts/flatpak/repo
 src/scripts/flatpak/remote
+*.app
 

src/app/GUI/mainwindow.cpp

@@ -39,6 +39,8 @@
 #include <QSpacerItem>
 #include <QMargins>
 #include <iostream>
+#include <QClipboard>
+#include <QMimeData>
 
 #include "GUI/edialogs.h"
 #include "dialogs/applyexpressiondialog.h"
@@ -570,6 +572,23 @@ void MainWindow::setupMenuBar()
         cmdAddAction(qAct);
     }
 
+    { // import (paste) SVG from clipboard
+        mEditMenu->addAction(QIcon::fromTheme("paste"),
+                             tr("Paste from Clipboard"),
+                             [this]() {
+            const auto clipboard = QGuiApplication::clipboard();
+            if (clipboard) {
+                const auto mime = clipboard->mimeData();
+                qDebug() << mime->formats() << mime->text();
+                if (mime->hasText() && mime->text().contains("<svg")) {
+                    const QString svg = mime->text();
+                    try { mActions.importClipboard(svg); }
+                    catch (const std::exception& e) { gPrintExceptionCritical(e); }
+                }
+            }
+        }, QKeySequence(tr("Ctrl+Shift+V")));
+    }
+
     {
         const auto qAct = new NoShortcutAction(tr("Duplicate", "MenuBar_Edit"));
         mEditMenu->addAction(qAct);
@@ -1120,7 +1139,9 @@ void MainWindow::setupMenuBar()
     help->addAction(QIcon::fromTheme("renderlayers"),
                     tr("Reinstall default Expressions Presets"),
                     this, &MainWindow::askInstallExpressionsPresets);
-
+    help->addAction(QIcon::fromTheme("color"),
+                    tr("Restore default fill and stroke"),
+                    this, &MainWindow::askRestoreFillStrokeDefault);
 
     // toolbar actions
     mToolbar->addAction(newAct);
@@ -1402,6 +1423,21 @@ void MainWindow::askInstallExpressionsPresets()
     AppSupport::setSettings("settings", "firstRunExprPresets", true);
 }
 
+void MainWindow::askRestoreFillStrokeDefault()
+{
+    const auto result = QMessageBox::question(this,
+                                              tr("Restore default fill and stroke?"),
+                                              tr("Are you sure you want to restore fill and stroke defaults?"));
+    if (result != QMessageBox::Yes) { return; }
+
+    auto settings = eSettings::sInstance;
+    settings->fLastFillFlatEnabled = false;
+    settings->fLastStrokeFlatEnabled = true;
+    settings->fLastUsedFillColor = Qt::white;
+    settings->fLastUsedStrokeColor = ThemeSupport::getThemeObjectColor();
+    settings->fLastUsedStrokeWidth = 10.;
+}
+
 void MainWindow::openWelcomeDialog()
 {
     mStackWidget->setCurrentIndex(mStackIndexWelcome);
@@ -1786,6 +1822,18 @@ void MainWindow::writeSettings()
     AppSupport::setSettings("ui", "geometry", saveGeometry());
     AppSupport::setSettings("ui", "maximized", isMaximized());
     AppSupport::setSettings("ui", "fullScreen", isFullScreen());
+
+    AppSupport::setSettings("FillStroke", "LastStrokeColor",
+                            eSettings::instance().fLastUsedStrokeColor);
+    AppSupport::setSettings("FillStroke", "LastStrokeWidth",
+                            eSettings::instance().fLastUsedStrokeWidth);
+    AppSupport::setSettings("FillStroke", "LastStrokeFlat",
+                            eSettings::instance().fLastStrokeFlatEnabled);
+
+    AppSupport::setSettings("FillStroke", "LastFillColor",
+                            eSettings::instance().fLastUsedFillColor);
+    AppSupport::setSettings("FillStroke", "LastFillFlat",
+                            eSettings::instance().fLastFillFlatEnabled);
 }
 
 bool MainWindow::isEnabled()

src/app/GUI/mainwindow.h

@@ -398,6 +398,7 @@ class MainWindow : public QMainWindow
     void initRenderPresets(const bool reinstall = false);
     void askInstallRenderPresets();
     void askInstallExpressionsPresets();
+    void askRestoreFillStrokeDefault();
 
     QLabel *mColorPickLabel;
 

src/core/Animators/outlinesettingsanimator.h

@@ -25,8 +25,10 @@
 
 #ifndef OUTLINESETTINGSANIMATOR_H
 #define OUTLINESETTINGSANIMATOR_H
+
 #include "paintsettingsanimator.h"
 #include "Animators/brushsettingsanimator.h"
+#include "Private/esettings.h"
 
 class CORE_EXPORT OutlineSettingsAnimator : public PaintSettingsAnimator {
     typedef qCubicSegment1DAnimator::Action SegAction;
@@ -129,6 +131,7 @@ class CORE_EXPORT OutlineSettingsAnimator : public PaintSettingsAnimator {
     qsptr<BrushSettingsAnimator> mBrushSettings =
             enve::make_shared<BrushSettingsAnimator>();
     qsptr<QrealAnimator> mLineWidth =
-            enve::make_shared<QrealAnimator>(10, 0, 999, 1, "thickness");
+            enve::make_shared<QrealAnimator>(eSettings::instance().fLastUsedStrokeWidth,
+                                             0, 999, 1, "thickness");
 };
 #endif // OUTLINESETTINGSANIMATOR_H

src/core/Animators/paintsettingsanimator.cpp

@@ -410,8 +410,9 @@ void PaintSettingsAnimator::showHideChildrenBeforeChangingPaintType(
         ca_addChild(mColor);
 }
 
-void PaintSettingsAnimator::setPaintType(const PaintType paintType) {
-    if(paintType == mPaintType) return;
+void PaintSettingsAnimator::setPaintType(const PaintType paintType)
+{
+    if (paintType == mPaintType) { return; }
     {
         UndoRedo ur;
         const auto oldValue = mPaintType;
@@ -433,6 +434,8 @@ void PaintSettingsAnimator::setPaintType(const PaintType paintType) {
     prp_afterWholeInfluenceRangeChanged();
 
     SWT_setDisabled(paintType == PaintType::NOPAINT);
+
+    emit paintTypeChanged(mPaintType);
 }
 
 ColorAnimator *PaintSettingsAnimator::getColorAnimator() {

src/core/Animators/paintsettingsanimator.h

@@ -47,6 +47,7 @@ class AdvancedTransformAnimator;
 struct UpdatePaintSettings;
 
 class CORE_EXPORT PaintSettingsAnimator : public ComplexAnimator {
+    Q_OBJECT
 protected:
     PaintSettingsAnimator(const QString &name,
                           BoundingBox * const parent);
@@ -86,6 +87,10 @@ class CORE_EXPORT PaintSettingsAnimator : public ComplexAnimator {
                             UpdatePaintSettings& settings);
     void duplicatePaintSettingsNotAnim(PaintSettingsAnimator * const settings);
     void applyTransform(const QMatrix& transform);
+
+signals:
+    void paintTypeChanged(const PaintType &type);
+
 protected:
     void saveSVG(SvgExporter& exp,
                  QDomElement& parent,

src/core/Boxes/pathbox.cpp

@@ -43,28 +43,35 @@
 #include "Boxes/smartvectorpath.h"
 #include "themesupport.h"
 
-PathBox::PathBox(const QString &name, const eBoxType type) :
-    BoxWithPathEffects(name, type) {
-    connect(this, &eBoxOrSound::parentChanged, this, [this]() {
+PathBox::PathBox(const QString &name,
+                 const eBoxType type)
+    : BoxWithPathEffects(name, type)
+{
+    connect(this, &eBoxOrSound::parentChanged,
+            this, [this]() {
         setPathsOutdated(UpdateReason::userChange);
     });
 
-    connect(mPathEffectsAnimators.get(), &Property::prp_currentFrameChanged,
+    connect(mPathEffectsAnimators.get(),
+            &Property::prp_currentFrameChanged,
             this, [this](const UpdateReason reason) {
         setPathsOutdated(reason);
     });
 
-    connect(mFillPathEffectsAnimators.get(), &Property::prp_currentFrameChanged,
+    connect(mFillPathEffectsAnimators.get(),
+            &Property::prp_currentFrameChanged,
             this, [this](const UpdateReason reason) {
         setFillPathOutdated(reason);
     });
 
-    connect(mOutlineBasePathEffectsAnimators.get(), &Property::prp_currentFrameChanged,
+    connect(mOutlineBasePathEffectsAnimators.get(),
+            &Property::prp_currentFrameChanged,
             this, [this](const UpdateReason reason) {
         setOutlinePathOutdated(reason);
     });
 
-    connect(mOutlinePathEffectsAnimators.get(), &Property::prp_currentFrameChanged,
+    connect(mOutlinePathEffectsAnimators.get(),
+            &Property::prp_currentFrameChanged,
             this, [this](const UpdateReason reason) {
         setOutlinePathOutdated(reason);
     });
@@ -74,8 +81,24 @@ PathBox::PathBox(const QString &name, const eBoxType type) :
     mStrokeSettings = enve::make_shared<OutlineSettingsAnimator>(this);
     mStrokeGradientPoints = mFillSettings->getGradientPoints();
 
-    mStrokeSettings->setPaintType(PaintType::FLATPAINT);
-    mStrokeSettings->setCurrentColor(ThemeSupport::getThemeObjectColor());
+    bool fillFlat = eSettings::instance().fLastFillFlatEnabled;
+    bool strokeFlat = eSettings::instance().fLastStrokeFlatEnabled;
+    if (!fillFlat && !strokeFlat) { strokeFlat = true; }
+
+    switch (type) {
+    case eBoxType::circle:
+    case eBoxType::rectangle:
+        mFillSettings->setPaintType(fillFlat ?
+                                    PaintType::FLATPAINT : PaintType::NOPAINT);
+        mStrokeSettings->setPaintType(strokeFlat ?
+                                      PaintType::FLATPAINT : PaintType::NOPAINT);
+        break;
+    default:
+        mStrokeSettings->setPaintType(PaintType::FLATPAINT);
+    }
+
+    mFillSettings->setCurrentColor(eSettings::instance().fLastUsedFillColor);
+    mStrokeSettings->setCurrentColor(eSettings::instance().fLastUsedStrokeColor);
 
     ca_prependChild(mPathEffectsAnimators.get(), mFillSettings);
     ca_prependChild(mPathEffectsAnimators.get(), mStrokeSettings);
@@ -90,6 +113,29 @@ PathBox::PathBox(const QString &name, const eBoxType type) :
     const auto brushSettings = mStrokeSettings->getBrushSettings();
     connect(brushSettings, &BrushSettingsAnimator::brushChanged,
             this, &BoundingBox::brushChanged);
+
+    connect(mFillSettings.get(),
+            &PaintSettingsAnimator::paintTypeChanged,
+            this, [this](const PaintType &type) {
+        switch (getBoxType()) {
+        case eBoxType::circle:
+        case eBoxType::rectangle:
+            eSettings::sInstance->fLastFillFlatEnabled = (type == PaintType::FLATPAINT);
+            break;
+        default:;
+        }
+    });
+    connect(mStrokeSettings.get(),
+            &PaintSettingsAnimator::paintTypeChanged,
+            this, [this](const PaintType &type) {
+        switch (getBoxType()) {
+        case eBoxType::circle:
+        case eBoxType::rectangle:
+            eSettings::sInstance->fLastStrokeFlatEnabled = (type == PaintType::FLATPAINT);
+            break;
+        default:;
+        }
+    });
 }
 
 HardwareSupport PathBox::hardwareSupport() const {

src/core/Boxes/textbox.cpp

@@ -39,9 +39,10 @@
 #include "svgexporter.h"
 #include "Private/esettings.h"
 
-TextBox::TextBox() : PathBox("Text", eBoxType::text) {
+TextBox::TextBox()
+    : PathBox("Text", eBoxType::text)
+{
     mFillSettings->setPaintType(PaintType::FLATPAINT);
-    mFillSettings->setCurrentColor(QColor(Qt::white));
     mStrokeSettings->setPaintType(PaintType::NOPAINT);
 
     const auto pathsUpdater = [this](const UpdateReason reason) {