Refactor SVG clipboard (paste)

rodlie · rodlie · commit e60be856f638 · 2026-02-28T02:18:46.000+01:00
Refactor the paste SVG from clipboard feature. Now works on properly on macOS. Based on work done by @pgilfernandez
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -401,6 +401,14 @@ if(${SKIA_STATIC})
     endif()
 endif()
 
+if(APPLE)
+    target_link_libraries(
+        ${PROJECT_NAME}
+        PRIVATE
+        "-framework AppKit"
+    )
+endif()
+
 if(UNIX AND NOT APPLE)
     target_link_libraries(
         ${PROJECT_NAME}
diff --git a/src/app/GUI/menu.cpp b/src/app/GUI/menu.cpp
@@ -28,6 +28,7 @@
 #include "memoryhandler.h"
 #include "misc/noshortcutaction.h"
 #include "dialogs/scenesettingsdialog.h"
+#include "system/svgclipboard.h"
 
 #include <QDesktopServices>
 #include <QClipboard>
@@ -230,15 +231,10 @@ void MainWindow::setupMenuBar()
         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();
+                                 const QString svg = Ui::SvgClipBoard::getContent();
+                                 if (!svg.isEmpty()) {
                                          try { mActions.importClipboard(svg); }
                                          catch (const std::exception& e) { gPrintExceptionCritical(e); }
-                                     }
                                  }
                              }, QKeySequence(tr("Ctrl+Shift+V")));
     }
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -20,6 +20,10 @@
 cmake_minimum_required(VERSION 3.12)
 project(frictionui LANGUAGES CXX)
 
+if(APPLE)
+    enable_language(OBJCXX)
+endif()
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 
 include(friction-version)
@@ -60,6 +64,7 @@ set(
     optimalscrollarena/scrollwidget.cpp
     optimalscrollarena/scrollwidgetvisiblepart.cpp
     optimalscrollarena/singlewidget.cpp
+    system/svgclipboard.cpp
     widgets/aboutwidget.cpp
     widgets/actionbutton.cpp
     widgets/alignwidget.cpp
@@ -111,6 +116,10 @@ set(
     widgets/wrappernode.cpp
 )
 
+if(APPLE)
+    list(APPEND SOURCES system/svgclipboard.mm)
+endif()
+
 set(
     HEADERS
     ui_global.h
@@ -136,6 +145,7 @@ set(
     optimalscrollarena/scrollwidget.h
     optimalscrollarena/scrollwidgetvisiblepart.h
     optimalscrollarena/singlewidget.h
+    system/svgclipboard.h
     widgets/aboutwidget.h
     widgets/actionbutton.h
     widgets/alignwidget.h
@@ -217,6 +227,14 @@ target_link_directories(
     ${SKIA_LIBRARIES_DIRS}
 )
 
+if(APPLE)
+    target_link_libraries(
+        ${PROJECT_NAME}
+        PRIVATE
+        "-framework AppKit"
+    )
+endif()
+
 target_link_libraries(
     ${PROJECT_NAME}
     PRIVATE
diff --git a/src/ui/system/svgclipboard.cpp b/src/ui/system/svgclipboard.cpp
@@ -0,0 +1,87 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Ole-André Rodlie and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+#include "svgclipboard.h"
+
+#include <QDomDocument>
+#include <QGuiApplication>
+#include <QClipboard>
+#include <QDebug>
+
+using namespace Friction::Ui;
+
+#ifndef Q_OS_MAC
+const QString SvgClipBoard::getContent()
+{
+    return getClipBoard();
+}
+#endif
+
+const QString SvgClipBoard::getContent(const QMimeData *mime)
+{
+    if (!mime) { return QString(); }
+
+    static const QStringList formats{"image/svg+xml",
+                                     "public.svg-image",
+                                     "com.seriflabs.svg",
+                                     "com.adobe.svg",
+                                     "com.adobe.illustrator.svg",
+                                     "com.adobe.illustrator.svgm",
+                                     "text/xml"};
+
+    for (const auto &format : formats) {
+        if (!mime->hasFormat(format)) { continue; }
+        const QString content = mime->data(format);
+        if (isSvg(content)) { return content; }
+    }
+
+    if (mime->hasText()) {
+        const QString text = mime->text();
+        if (isSvg(text)) { return text; }
+    }
+
+    return QString();
+}
+
+bool SvgClipBoard::isSvg(const QString &content)
+{
+    qDebug() << "SVG in clipboard?" << content;
+    if (content.isEmpty() ||
+        !content.contains("<svg", Qt::CaseInsensitive)) {
+        return false;
+    }
+
+    QDomDocument doc;
+    if (doc.setContent(content)) {
+        const auto root = doc.documentElement();
+        return root.tagName().toLower() == "svg" ||
+               root.localName().toLower() == "svg";
+    }
+    return false;
+}
+
+const QString SvgClipBoard::getClipBoard()
+{
+    const auto clipboard = QGuiApplication::clipboard();
+    if (clipboard) { return getContent(clipboard->mimeData()); }
+    return QString();
+}
diff --git a/src/ui/system/svgclipboard.h b/src/ui/system/svgclipboard.h
@@ -0,0 +1,48 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Ole-André Rodlie and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+#ifndef FRICTION_SVG_CLIPBOARD_H
+#define FRICTION_SVG_CLIPBOARD_H
+
+#include "ui_global.h"
+
+#include <QString>
+#include <QMimeData>
+
+namespace Friction
+{
+    namespace Ui
+    {
+        class UI_EXPORT SvgClipBoard
+        {
+        public:
+            static const QString getContent();
+
+        private:
+            static const QString getContent(const QMimeData *mime);
+            static bool isSvg(const QString &content);
+            static const QString getClipBoard();
+        };
+    }
+}
+
+#endif // FRICTION_SVG_CLIPBOARD_H
diff --git a/src/ui/system/svgclipboard.mm b/src/ui/system/svgclipboard.mm
@@ -0,0 +1,51 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Ole-André Rodlie and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+#include "svgclipboard.h"
+
+#ifdef Q_OS_MAC
+#import <AppKit/AppKit.h>
+
+using namespace Friction::Ui;
+
+const QString SvgClipBoard::getContent()
+{
+    @autoreleasepool{
+        NSPasteboard* pb = [NSPasteboard generalPasteboard];
+        if (!pb) { return QString(); }
+        NSArray<NSString*>* types = @[@"public.svg-image",
+                                      @"org.inkscape.svg",
+                                      @"com.seriflabs.svg",
+                                      @"com.adobe.svg",
+                                      @"com.adobe.illustrator.svg",
+                                      @"com.adobe.illustrator.svgm",
+                                      NSPasteboardTypeString];
+        for (NSString* type in types) {
+            NSString* str = [pb stringForType:type];
+            if (!str) { continue; }
+            const QString qStr = QString::fromUtf8([str UTF8String]);
+            if (isSvg(qStr)) { return qStr; }
+        }
+    }
+    return getClipBoard();
+}
+#endif
