mirror of
https://github.com/ZSeven-W/openpencil.git
synced 2026-05-31 19:04:29 +07:00
68a7e534fd
Continues the gradient + property-panel polish from the previous commit and rounds out two new flows the TS app already has: Gradient stops + effects: - ColorTarget gains GradientStop(i) + EffectColor(i); HSV picker preserves alpha across hue/SV drags so a transparent stop stays transparent. Hex pill stays 6-char; alpha is reattached at commit and the swatch sits on a 2x2 alpha checker so #00000000 reads as transparent rather than empty. - Effects section reflowed into card-style blocks (image #9 spec): title + minus, X/Y and Blur/Spread 2-col grids, color row with swatch + rgba(...) text; clicking the swatch opens an HSV picker bound to that effect index via SetEffectColor. - Press dispatch on both hosts anchors picker overlays at the clicked y so they pop adjacent to the swatch instead of the top. Image + SVG import (toolbar + Fill section "图片" row): - New FileAction::ImportImageOrSvg / PickFillImage; persistence_image pops rfd, decodes raster as data: URL, inserts an Image node or rewrites the selected node's primary fill. - ImageNode actually renders on the canvas: NodePayload + SceneNode carry image_src, canvas_viewport_paint.rs decodes the data URL once and hands raw bytes to RenderBackend::draw_image with a src-hash cache id. Grey placeholder paints only when decode fails so transparent PNGs don't get a grey matte underneath. - SVG import ported to TS-parity (packages/pen-engine svg-parser): recursive <g> tree walk with inherited fill/stroke/style="...", viewBox-aware scaling with maxDim cap, multi-subpath split, raw d preserved on PathNode. Imports land wrapped in a Group named after the source file. Locale-aware first run: - settings_io detects the OS locale (LC_ALL/LANG/LC_MESSAGES with zh-Hans/zh-Hant heuristics) and seeds editor_ui.locale before settings.json is read; persisted user choice still wins. - macOS bundle declares CFBundleLocalizations + AllowMixedLocalizations so NSOpenPanel / NSSavePanel render in the same language as the rest of the chrome. Web host kept exhaustive across the new variants (PickFillImage, OpenEffectColorPicker, ColorTarget::EffectColor, GradientStop). Two new files: persistence_image.rs (file-pick handlers, ≤120 lines) and svg_path_data.rs (path-d tokenizer + bbox + normaliser, split from svg_import.rs to stay under the 800-line cap). 277 op-editor-core tests pass.
68 lines
2.3 KiB
Bash
Executable file
68 lines
2.3 KiB
Bash
Executable file
#!/bin/sh
|
|
# Wrap the built desktop binary in a minimal `OpenPencil.app` so
|
|
# macOS shows the proper Dock name + icon.
|
|
#
|
|
# A bare binary (`target/release/openpencil-desktop`) has no
|
|
# `Info.plist`, so the Dock falls back to the raw executable name
|
|
# and a generic icon. Running the binary from *inside* a `.app`
|
|
# directory makes macOS pick up the bundle's `CFBundleName` + icon
|
|
# even without `cargo bundle`.
|
|
#
|
|
# Usage: tools/bundle-macos.sh (after `cargo build -p op-host-desktop --release`)
|
|
# Then run: target/release/OpenPencil.app/Contents/MacOS/openpencil-desktop
|
|
set -e
|
|
|
|
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
|
BIN="$ROOT/target/release/openpencil-desktop"
|
|
ICON="$ROOT/crates/op-host-desktop/assets/icon.icns"
|
|
APP="$ROOT/target/release/OpenPencil.app"
|
|
|
|
if [ ! -x "$BIN" ]; then
|
|
echo "bundle-macos: $BIN not found — run 'cargo build -p op-host-desktop --release' first" >&2
|
|
exit 1
|
|
fi
|
|
|
|
rm -rf "$APP"
|
|
mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
|
|
cp "$BIN" "$APP/Contents/MacOS/openpencil-desktop"
|
|
cp "$ICON" "$APP/Contents/Resources/icon.icns"
|
|
|
|
cat > "$APP/Contents/Info.plist" <<'PLIST'
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
<plist version="1.0">
|
|
<dict>
|
|
<key>CFBundleName</key><string>OpenPencil</string>
|
|
<key>CFBundleDisplayName</key><string>OpenPencil</string>
|
|
<key>CFBundleExecutable</key><string>openpencil-desktop</string>
|
|
<key>CFBundleIdentifier</key><string>com.zseven-w.openpencil</string>
|
|
<key>CFBundleAllowMixedLocalizations</key><true/>
|
|
<key>CFBundleDevelopmentRegion</key><string>en</string>
|
|
<key>CFBundleLocalizations</key>
|
|
<array>
|
|
<string>en</string>
|
|
<string>zh-Hans</string>
|
|
<string>zh-Hant</string>
|
|
<string>ja</string>
|
|
<string>ko</string>
|
|
<string>fr</string>
|
|
<string>es</string>
|
|
<string>de</string>
|
|
<string>pt</string>
|
|
<string>ru</string>
|
|
<string>hi</string>
|
|
<string>tr</string>
|
|
<string>th</string>
|
|
<string>vi</string>
|
|
<string>id</string>
|
|
</array>
|
|
<key>CFBundleIconFile</key><string>icon</string>
|
|
<key>CFBundlePackageType</key><string>APPL</string>
|
|
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
|
|
<key>CFBundleShortVersionString</key><string>0.8.0</string>
|
|
<key>NSHighResolutionCapable</key><true/>
|
|
</dict>
|
|
</plist>
|
|
PLIST
|
|
|
|
echo "bundle-macos: built $APP"
|