DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
fix(linux): enable font-free Wayland window controls
Daniel7c3e60b6c46d
diff --git a/Cargo.lock b/Cargo.lockindex 3db056251..92345bf86 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2560,7 +2560,7 @@ dependencies = ["skrifa 0.42.1","smallvec","subsetter",- "tiny-skia-path",+ "tiny-skia-path 0.12.0","xmp-writer","yoke","zune-jpeg",@@ -2578,7 +2578,7 @@ dependencies = ["resvg","skrifa 0.42.1","smallvec",- "tiny-skia",+ "tiny-skia 0.12.0","usvg",]@@ -3837,7 +3837,7 @@ dependencies = ["pico-args","rgb","svgtypes",- "tiny-skia",+ "tiny-skia 0.12.0","usvg","zune-jpeg",]@@ -4009,6 +4009,17 @@ version = "1.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"+[[package]]+name = "sctk-adwaita"+version = "0.10.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"+dependencies = [+ "log",+ "smithay-client-toolkit 0.19.2",+ "tiny-skia 0.11.4",+]+[[package]]name = "self_cell"version = "1.3.0"@@ -4444,6 +4455,20 @@ dependencies = ["zune-jpeg",]+[[package]]+name = "tiny-skia"+version = "0.11.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"+dependencies = [+ "arrayref",+ "arrayvec",+ "bytemuck",+ "cfg-if",+ "log",+ "tiny-skia-path 0.11.4",+]+[[package]]name = "tiny-skia"version = "0.12.0"@@ -4456,7 +4481,18 @@ dependencies = ["cfg-if","log","png",- "tiny-skia-path",+ "tiny-skia-path 0.12.0",+]++[[package]]+name = "tiny-skia-path"+version = "0.11.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"+dependencies = [+ "arrayref",+ "bytemuck",+ "strict-num",][[package]]@@ -4714,7 +4750,7 @@ dependencies = ["siphasher","strict-num","svgtypes",- "tiny-skia-path",+ "tiny-skia-path 0.12.0","ttf-parser","unicode-bidi","unicode-script",@@ -5651,6 +5687,7 @@ dependencies = ["raw-window-handle","redox_syscall 0.4.1","rustix 0.38.44",+ "sctk-adwaita","smithay-client-toolkit 0.19.2","smol_str","tracing",diff --git a/NOTICE b/NOTICEindex f4e3184f6..0a875190e 100644--- a/NOTICE+++ b/NOTICE@@ -90,3 +90,34 @@ Rust dependencies (vello_cpu, kurbo, skrifa, harfrust, image, egui, eframe, …)licensed (MIT/Apache-2.0/BSD/ISC/Zlib) and fetched through crates.io.No Adobe icons, images or artwork are included.++Linux Wayland window decorations+-------------------------------+sctk-adwaita 0.10.1 (https://github.com/PolyMeilex/sctk-adwaita,+commit d5f343c45c04d4a026db57f76760819b7325db00) is used by winit on Linux+for vector window controls. Its title-font features are disabled: no Cantarell+font is embedded by this dependency and no font file is added to this repo.++sctk-adwaita's MIT licence:++MIT License++Copyright (c) 2022 Bartłomiej Maryńczak++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.diff --git a/apps/designcraft/Cargo.toml b/apps/designcraft/Cargo.tomlindex 7dc83bc55..300ab225c 100644--- a/apps/designcraft/Cargo.toml+++ b/apps/designcraft/Cargo.toml@@ -50,3 +50,8 @@ objc2-app-kit = { version = "0.3", default-features = false, features = ["std",# PdfCraft and WordCraft) registers the handler behind a safe API (Objective-C interop needs unsafe,# which the workspace forbids). Pinned exactly: review the diff before bumping.fmv-macos-events = "=0.1.0"++[target.'cfg(target_os = "linux")'.dependencies]+# Native GNOME/Wayland controls without a bundled title font.+winit = { version = "0.30", default-features = false, features = ["wayland-csd-adwaita-notitle"] }+diff --git a/packaging/env.sh b/packaging/env.shindex 0eb58029b..60ae3b0cb 100644--- a/packaging/env.sh+++ b/packaging/env.sh@@ -47,7 +47,7 @@ warn() {# Copy licence and readme files that exist into a package directory.copy_docs() {local dest="$1" f- for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do+ for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT NOTICE; doif [ -f "$ROOT/$f" ]; then cp "$ROOT/$f" "$dest/"; fidonecopy_font_licences "$dest"diff --git a/packaging/linux/flatpak/ai.storyteller.designcraft.yml b/packaging/linux/flatpak/ai.storyteller.designcraft.ymlindex aabee2ebb..5335d7a66 100644--- a/packaging/linux/flatpak/ai.storyteller.designcraft.yml+++ b/packaging/linux/flatpak/ai.storyteller.designcraft.yml@@ -46,6 +46,7 @@ modules:build-commands:- cargo --offline build --release --locked -p designcraft- install -Dm755 target/release/designcraft /app/bin/designcraft+ - install -Dm644 NOTICE /app/share/doc/designcraft/NOTICE- install -Dm644 packaging/linux/ai.storyteller.designcraft.desktop /app/share/applications/ai.storyteller.designcraft.desktop- install -Dm644 packaging/linux/ai.storyteller.designcraft.mime.xml /app/share/mime/packages/ai.storyteller.designcraft.xml- mkdir -p /app/share/icons && cp -R assets/app-icon/hicolor /app/share/icons/diff --git a/packaging/linux/package.sh b/packaging/linux/package.shindex 2d7b80ee8..43cf7dae3 100755--- a/packaging/linux/package.sh+++ b/packaging/linux/package.sh@@ -138,6 +138,8 @@ if has appimage; thenAPPDIR="$WORK/DesignCraft.AppDir"cp -R "$STAGE" "$APPDIR"mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"+ # Keep sctk-adwaita's MIT notice in the AppImage.+ install -Dm644 "$ROOT/NOTICE" "$APPDIR/usr/share/doc/designcraft/NOTICE"ln -s usr/bin/designcraft "$APPDIR/AppRun"cp "$HERE/$APP_ID.desktop" "$APPDIR/$APP_ID.desktop"cp "$ROOT/assets/app-icon/hicolor/256x256/apps/$APP_ID.png" "$APPDIR/$APP_ID.png"