Skip to content

ProCraft for Android: An Android native painting app written in Rust

Rust

feat(ui): our own icons for the Selection toolbar

Joshcc3beb994e01
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index 556fe95..891a2a9 100644
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -13,7 +13,7 @@ them.
| `apps/procraft-android/android/app/src/main/assets/fonts/Inter-{Regular,Medium,SemiBold,Bold}.ttf` | Inter 4.1 (interface font) | The Inter Project Authors | <https://github.com/rsms/inter/releases/tag/v4.1> (`Inter-4.1.zip`, `extras/ttf/`; `SOURCE.md` beside them) | SIL OFL 1.1, `Inter-OFL.txt` |
| `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` (the icons listed below as Phosphor) | Phosphor icons, @phosphor-icons/core 2.1.1, Fill weight | Phosphor Icons | <https://github.com/phosphor-icons/core>; each icon's paths moved and scaled into the frame it is shown in, at the size shown | MIT, [`LICENSE-phosphor.txt`](apps/procraft-android/android/app/src/main/assets/icons/LICENSE-phosphor.txt) |
| `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LucideIcons.kt` (the same icons as Lucide draws them, kept beside them) | Lucide icons, lucide-static 1.63.0 | Lucide Icons and Contributors (those derived from Feather: Cole Bemis) | <https://github.com/lucide-icons/lucide>; each icon's paths moved and scaled into the frame it is shown in, at the size shown | ISC (Feather-derived also MIT), [`LICENSE-lucide.txt`](apps/procraft-android/android/app/src/main/assets/icons/LICENSE-lucide.txt) |
-| `assets/icons/procraft/*.svg`, and in `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` the bar's icons (`Actions`, `Adjustments`, `Selection`, `Transform`, `Brush`, `Smudge`, `Erase`, `Layers`, `Undo`, `Redo`) and the Actions panel's tabs (`TabAdd`, `TabCanvas`, `TabShare`, `TabVideo`, `TabPrefs`, `TabHelp`) | ProCraft's own interface icons | ProCraft contributors | Original work, drawn from the idea to [`docs/icons/STYLE_GUIDE.md`](docs/icons/STYLE_GUIDE.md) by `tools/icons/draw_icons.py`; placed by the measured slots in `assets/icons/slots.tsv` | MIT OR Apache-2.0 |
+| `assets/icons/procraft/*.svg`, and in `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` the bar's icons (`Actions`, `Adjustments`, `Selection`, `Transform`, `Brush`, `Smudge`, `Erase`, `Layers`, `Undo`, `Redo`) and the Actions panel's tabs (`TabAdd`, `TabCanvas`, `TabShare`, `TabVideo`, `TabPrefs`, `TabHelp`) and the Selection toolbar's (`SelectCopyPaste`, `Automatic`, `Freehand`, `RectangleShape`, `EllipseShape`, `SelectAdd`, `SelectRemove`, `Invert`, `Feather`, `SaveLoad`, `ColorFill`, `ClearSelection`) | ProCraft's own interface icons | ProCraft contributors | Original work, drawn from the idea to [`docs/icons/STYLE_GUIDE.md`](docs/icons/STYLE_GUIDE.md) by `tools/icons/draw_icons.py`; placed by the measured slots in `assets/icons/slots.tsv` | MIT OR Apache-2.0 |
| `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` (every other icon) | Interface icons | ProCraft contributors | Original work, on a 24-unit grid | MIT OR Apache-2.0 |
| `apps/procraft-android/android/app/src/main/assets/environments/*.hdr` | 3D view light panoramas (11), halved to 512 x 256 and scaled by `tools/env/make_env.py` | Sergej Majboroda, Greg Zaal, Andreas Mischok, Rico Cilliers (per file in the folder's `README.md`) | <https://polyhaven.com> | CC0 1.0 |
| `assets/app-icon/procraft-{1024,512}.png`, `apps/procraft-android/android/app/src/main/res/drawable-*dpi/ic_launcher_{foreground,monochrome}.png`, `apps/procraft-android/android/app/src/main/res/drawable-nodpi/procraft_mark.png`, `apps/procraft-android/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml` | App icon: a paintbrush in a warm-to-cool blend on black | ProCraft contributors | Original work, drawn in code by `tools/app-icon/make_icon.py`; see [`assets/app-icon/README.md`](assets/app-icon/README.md) | MIT OR Apache-2.0 |
@@ -26,7 +26,6 @@ Each with the Phosphor icon it is (Fill weight):
- `FullScreen`: `arrows-out-simple`
- `TransformReset`: `arrow-counter-clockwise`
-- `SelectCopyPaste`: `copy`
- `StudioShape`: `shapes`
- `GestureCopyPaste`: `clipboard`
- `MenuNewBrush`: `paint-brush`
@@ -150,17 +149,6 @@ Each with the Phosphor icon it is (Fill weight):
- `Apply`: `check`
- `Preview`: `eye`
- `CancelAdjust`: `prohibit`
-- `Automatic`: `magic-wand`
-- `Freehand`: `lasso`
-- `RectangleShape`: `selection`
-- `EllipseShape`: `circle-dashed`
-- `SelectAdd`: `plus`
-- `SelectRemove`: `minus`
-- `Invert`: `circle-half`
-- `Feather`: `feather`
-- `SaveLoad`: `floppy-disk`
-- `ColorFill`: `paint-bucket`
-- `ClearSelection`: `broom`
- `BlendGlyphs["Multiply"]`: `x-circle`
- `BlendGlyphs["Darken"]`: `moon`
- `BlendGlyphs["Shade"]`: `sun-horizon`
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt
index 19c5e3d..b35e02d 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt
@@ -29,7 +29,7 @@ object PcIcons {
val Undo by lazy { ours("undo", 50f, "M14.5 24.13L14.66 24.34L14.89 24.48L15.28 24.49L20.48 23.1L20.72 22.98L20.89 22.78L20.98 22.53L20.96 22.26L20.84 22.03L20.64 21.85L18.99 20.9L19.6 19.98L19.96 19.56L20.76 18.8L21.66 18.15L22.14 17.88L22.63 17.64L23.68 17.28L24.76 17.06L25.86 17L26.96 17.1L28.03 17.35L29.06 17.75L30.02 18.29L30.9 18.96L31.67 19.75L32.01 20.18L32.6 21.12L33.05 22.13L33.35 23.19L33.45 23.73L33.52 24.83L33.5 25.38L33.34 26.48L33.02 27.53L32.81 28.04L32.28 29.01L31.62 29.89L30.84 30.67L29.95 31.34L28.99 31.87L27.95 32.26L26.88 32.49L25.77 32.58L25.22 32.56L24.13 32.41L22.72 32.02L22.13 32.02L21.84 32.09L21.31 32.36L20.89 32.78L20.62 33.3L20.53 33.89L20.62 34.47L20.89 35L21.31 35.42L21.84 35.69L23.29 36.1L24.09 36.24L25.04 36.34L26.55 36.33L27.5 36.23L28.97 35.9L29.75 35.64L30.63 35.27L31.95 34.55L32.73 34.01L33.36 33.49L33.96 32.92L34.95 31.79L35.49 31L36.22 29.68L36.58 28.8L36.84 28.02L37.17 26.55L37.27 25.61L37.28 24.1L37.19 23.15L36.88 21.68L36.63 20.9L36.32 20.13L35.9 19.28L35.1 18L34.51 17.25L33.46 16.18L32.72 15.57L32.05 15.1L30.74 14.36L29.86 13.98L28.42 13.54L27.62 13.37L26.67 13.26L25.85 13.22L24.35 13.3L23.41 13.45L22.61 13.65L21.83 13.9L20.45 14.5L19.73 14.9L18.94 15.42L17.78 16.39L17.11 17.07L16.59 17.7L15.75 18.95L17.35 19.95L14.06 18.05L13.67 17.96L13.3 18.1L13.07 18.42L13.06 18.81Z") }
val Redo by lazy { ours("redo", 50f, "M35.76 24.13L35.59 24.34L35.36 24.48L34.97 24.49L29.78 23.1L29.55 22.98L29.37 22.78L29.29 22.53L29.3 22.27L29.42 22.03L29.62 21.86L31.27 20.9L30.66 19.99L30.3 19.57L29.5 18.81L28.61 18.16L28.13 17.89L27.63 17.66L26.59 17.29L25.51 17.08L24.41 17.02L23.31 17.11L22.24 17.36L21.21 17.76L20.25 18.3L19.38 18.97L18.61 19.76L18.27 20.19L17.68 21.12L17.23 22.13L16.93 23.19L16.84 23.73L16.76 24.83L16.79 25.38L16.95 26.47L17.26 27.53L17.47 28.04L18 29L18.67 29.88L19.44 30.66L20.33 31.32L21.29 31.85L22.32 32.24L23.4 32.48L24.5 32.57L25.05 32.55L26.14 32.4L27.55 32.01L28.14 32.01L28.43 32.08L28.95 32.34L29.37 32.76L29.64 33.29L29.73 33.87L29.64 34.45L29.37 34.98L28.95 35.4L28.43 35.67L26.98 36.08L26.18 36.22L25.23 36.32L23.72 36.31L22.78 36.21L21.31 35.88L20.53 35.62L19.65 35.26L18.34 34.53L17.55 33.99L16.92 33.47L16.32 32.91L15.34 31.77L14.8 30.99L14.07 29.67L13.71 28.8L13.45 28.02L13.12 26.55L13.02 25.6L13.01 24.1L13.1 23.15L13.41 21.68L13.66 20.9L13.96 20.14L14.38 19.29L15.18 18.01L15.77 17.27L16.83 16.19L17.56 15.59L18.23 15.11L19.54 14.38L20.41 14L21.85 13.56L22.65 13.39L23.6 13.28L24.42 13.24L25.92 13.32L26.86 13.47L27.65 13.67L28.43 13.92L29.81 14.51L30.53 14.91L31.32 15.44L31.97 15.94L33.05 16.98L33.67 17.71L34.51 18.96L32.91 19.96L36.2 18.06L36.58 17.97L36.95 18.11L37.18 18.43L37.19 18.82Z") }
val TransformReset by lazy { phosphor("transformreset", 44f, "M 32,22 a 9.18,9.18 0 0,1-9.06,9.18 L 22.82,31.18 A 9.13,9.13 0 0,1 16.51,28.68 a 0.77,0.77 0 0,1 1.05,-1.11 A 7.65,7.65 0 1,0 17.4,16.58 a 0.29,0.29 0 0,1-0.02,0.02 L 16.37,17.53 l 1.63,1.63 A 0.77,0.77 0 0,1 17.46,20.47 L 12.87,20.47 a 0.77,0.77 0 0,1-0.77,-0.77 L 12.1,15.11 A 0.77,0.77 0 0,1 13.41,14.57 L 15.29,16.45 L 16.33,15.49 A 9.18,9.18 0 0,1 32,22 Z") }
- val SelectCopyPaste by lazy { phosphor("selectcopypaste", 44f, "M 29.52,13.8 L 18.59,13.8 a 0.68,0.68 0 0,0-0.68,0.68 L 17.91,17.9 L 14.49,17.9 a 0.68,0.68 0 0,0-0.68,0.68 L 13.81,29.52 a 0.68,0.68 0 0,0 0.68,0.68 L 25.42,30.2 a 0.68,0.68 0 0,0 0.68,-0.68 L 26.11,26.1 l 3.42,0 a 0.68,0.68 0 0,0 0.68,-0.68 L 30.21,14.48 A 0.68,0.68 0 0,0 29.52,13.8 Z m-0.68,10.93 L 26.11,24.73 L 26.11,18.58 a 0.68,0.68 0 0,0-0.68,-0.68 L 19.27,17.9 L 19.27,15.17 L 28.84,15.17 Z") }
+ val SelectCopyPaste by lazy { ours("selectcopypaste", 44f, "M25.06 14.66L24.82 14.37L24.52 14.13L24.19 13.95L23.83 13.84L23.45 13.8L15.73 13.8L15.36 13.84L15 13.95L14.66 14.13L14.37 14.37L14.13 14.66L13.95 14.99L13.84 15.35L13.8 15.73L13.8 23.45L13.84 23.82L13.95 24.19L14.13 24.52L14.37 24.81L14.66 25.05L15 25.23L15.36 25.34L15.73 25.38L17.47 25.38L17.47 23.45L15.93 23.45L15.82 23.41L15.74 23.29L15.73 15.92L15.79 15.79L15.93 15.73L23.3 15.73L23.42 15.82L23.45 15.92L23.45 17.47L25.38 17.47L25.38 15.73L25.34 15.35L25.23 14.99ZM30.17 20.18L30.06 19.81L29.88 19.48L29.64 19.19L29.35 18.95L29.01 18.77L28.65 18.66L28.28 18.62L20.56 18.62L20.18 18.66L19.82 18.77L19.49 18.95L19.19 19.19L18.95 19.48L18.78 19.81L18.67 20.18L18.63 20.55L18.63 28.27L18.67 28.65L18.78 29.01L18.95 29.34L19.19 29.63L19.49 29.87L19.82 30.05L20.18 30.16L20.56 30.2L28.28 30.2L28.65 30.16L29.01 30.05L29.35 29.87L29.64 29.63L29.88 29.34L30.06 29.01L30.17 28.65L30.2 28.27L30.2 20.55Z") }
/** A plus. */
val PlusMedium by lazy { icon("plus-medium", Part("M20.5 8.6v22.8", 2.3f, false), Part("M9.1 20h22.8", 2.3f, false), viewport = 41f, viewportHeight = 40f) }
val StudioShape by lazy { phosphor("studioshape", 50f, "M 23.96,30.13 A 0.67,0.67 0 0,1 23.33,31.01 L 16.65,31.01 a 0.67,0.67 0 0,1-0.63,-0.88 l 3.34,-10.02 a 0.67,0.67 0 0,1 1.27,0 Z M 32.02,21.32 a 4.34,4.34 0 1,0-4.34,4.34 A 4.35,4.35 0 0,0 32.02,21.32 Z m 1.34,5.68 L 26,27 a 0.67,0.67 0 0,0-0.67,0.67 l 0,4.68 a 0.67,0.67 0 0,0 0.67,0.67 l 7.35,0 a 0.67,0.67 0 0,0 0.67,-0.67 L 34.02,27.66 A 0.67,0.67 0 0,0 33.35,27 Z") }
@@ -636,14 +636,14 @@ object PcIcons {
val Preview by lazy { phosphor("preview", 50f, "M 45.99,24.26 c-0.06,-0.14-1.59,-3.53-4.98,-6.92 C 36.5,12.82 30.79,10.44 24.51,10.44 S 12.53,12.82 8.01,17.34 C 4.62,20.73 3.09,24.12 3.03,24.26 a 1.44,1.44 0 0,0 0,1.17 c 0.06,0.14 1.59,3.52 4.98,6.91 C 12.53,36.85 18.23,39.24 24.51,39.24 s 11.98,-2.39 16.5,-6.9 c 3.39,-3.39 4.91,-6.77 4.98,-6.91 A 1.44,1.44 0 0,0 45.99,24.26 Z M 24.51,32.04 a 7.2,7.2 0 1,1 7.2,-7.2 A 7.2,7.2 0 0,1 24.51,32.04 Z") }
val CancelAdjust by lazy { phosphor("canceladjust", 50f, "M 36.64,24.83 a 10.6,10.6 0 0,1-2.33,6.64 L 19.35,16.52 A 10.64,10.64 0 0,1 36.64,24.83 Z M 15.34,24.83 a 10.64,10.64 0 0,0 17.29,8.31 L 17.68,18.19 A 10.6,10.6 0 0,0 15.34,24.83 Z m 26.62,0 A 15.97,15.97 0 1,1 25.99,8.86 A 15.99,15.99 0 0,1 41.96,24.83 Z m-2.96,0 a 13.01,13.01 0 1,0-13.01,13.01 A 13.03,13.03 0 0,0 39,24.83 Z") }
// the selection toolbar
- val Automatic by lazy { phosphor("automatic", 44f, "M 31,24 a 0.67,0.67 0 0,1-0.67,0.67 L 29,24.67 l 0,1.33 a 0.67,0.67 0 0,1-1.33,0 L 27.67,24.67 L 26.33,24.67 a 0.67,0.67 0 0,1 0,-1.33 l 1.33,0 L 27.67,22 a 0.67,0.67 0 0,1 1.33,0 l 0,1.33 l 1.33,0 A 0.67,0.67 0 0,1 31,24 Z M 15,17.33 L 16.33,17.33 L 16.33,18.67 a 0.67,0.67 0 0,0 1.33,0 L 17.67,17.33 l 1.33,0 a 0.67,0.67 0 0,0 0,-1.33 L 17.67,16 L 17.67,14.67 a 0.67,0.67 0 0,0-1.33,0 L 16.33,16 L 15,16 a 0.67,0.67 0 0,0 0,1.33 Z M 25.67,27.33 l-0.67,0 l 0,-0.67 a 0.67,0.67 0 0,0-1.33,0 l 0,0.67 l-0.67,0 a 0.67,0.67 0 0,0 0,1.33 l 0.67,0 l 0,0.67 a 0.67,0.67 0 0,0 1.33,0 l 0,-0.67 l 0.67,0 a 0.67,0.67 0 0,0 0,-1.33 Z M 28.61,18 L 17,29.61 a 1.33,1.33 0 0,1-1.88,0 L 13.39,27.89 a 1.33,1.33 0 0,1 0,-1.89 L 25,14.39 a 1.33,1.33 0 0,1 1.89,0 l 1.72,1.72 A 1.33,1.33 0 0,1 28.61,18 Z M 27.67,17.06 L 25.94,15.33 l-2.67,2.67 L 25,19.72 Z") }
- val Freehand by lazy { phosphor("freehand", 44f, "M 18.94,22.69 a 1.5,1.5 0 0,0-1.35,0.54 c 0.82,0.58 1.97,0.99 3.28,1.15 C 20.43,23.32 19.67,22.77 18.94,22.69 Z", "M 30.39,14.96 L 30.39,28.99 a 1.4,1.4 0 0,1-1.4,1.4 L 21.94,30.4 a 0.35,0.35 0 0,1-0.28,-0.56 c 0.66,-0.9 1.02,-2.04 1.02,-3.32 c 0,-0.24-0.01,-0.48-0.03,-0.71 C 26.25,25.6 28.99,23.69 28.99,21.28 c 0,-2.56-3.08,-4.56-7.02,-4.56 S 14.95,18.72 14.95,21.28 c 0,2.4 2.7,4.3 6.28,4.54 a 6.75,6.75 0 0,1 0.04,0.71 c 0,1.55-0.67,2.8-1.84,3.45 A 3.4,3.4 0 0,1 17.7,30.4 L 14.95,30.4 a 1.4,1.4 0 0,1-1.4,-1.4 L 13.55,14.96 A 1.4,1.4 0 0,1 14.95,13.56 L 28.99,13.56 A 1.4,1.4 0 0,1 30.39,14.96 Z m-2.81,6.32 c 0,-1.71-2.57,-3.16-5.61,-3.16 s-5.61,1.45-5.61,3.16 a 1.87,1.87 0 0,0 0.26,0.93 A 2.95,2.95 0 0,1 19.09,21.29 c 1.32,0.14 2.71,1.18 3.29,3.13 C 25.24,24.3 27.59,22.91 27.59,21.28 Z") }
- val RectangleShape by lazy { phosphor("rectangleshape", 44f, "M 27.38,15.55 L 16.62,15.55 A 1.07,1.07 0 0,0 15.55,16.62 L 15.55,27.38 a 1.07,1.07 0 0,0 1.07,1.07 L 27.38,28.45 a 1.07,1.07 0 0,0 1.07,-1.07 L 28.45,16.62 A 1.07,1.07 0 0,0 27.38,15.55 Z M 20.39,26.84 L 18.24,26.84 a 1.07,1.07 0 0,1-1.07,-1.07 L 17.16,23.61 a 0.54,0.54 0 0,1 1.07,0 l 0,2.15 l 2.15,0 a 0.54,0.54 0 0,1 0,1.07 Z m 0,-8.6 L 18.24,18.24 l 0,2.15 a 0.54,0.54 0 0,1-1.07,0 L 17.16,18.24 A 1.07,1.07 0 0,1 18.24,17.16 l 2.15,0 a 0.54,0.54 0 0,1 0,1.07 Z m 6.45,7.53 a 1.07,1.07 0 0,1-1.07,1.07 L 23.61,26.84 a 0.54,0.54 0 0,1 0,-1.07 l 2.15,0 L 25.76,23.61 a 0.54,0.54 0 0,1 1.07,0 Z m 0,-5.38 a 0.54,0.54 0 0,1-1.07,0 L 25.76,18.24 L 23.61,18.24 a 0.54,0.54 0 0,1 0,-1.07 l 2.15,0 a 1.07,1.07 0 0,1 1.07,1.07 Z") }
- val EllipseShape by lazy { phosphor("ellipseshape", 44f, "M 22.01,15.57 A 6.45,6.45 0 1,0 28.45,22.02 A 6.45,6.45 0 0,0 22.01,15.57 Z m 3.38,2.79 a 0.5,0.5 0 0,1 0.7,0.04 a 5.45,5.45 0 0,1 1.09,1.89 a 0.5,0.5 0 0,1-0.94,0.31 a 4.45,4.45 0 0,0-0.89,-1.55 A 0.5,0.5 0 0,1 25.39,18.36 Z M 18.62,25.68 a 0.5,0.5 0 0,1-0.7,-0.04 a 5.45,5.45 0 0,1-1.09,-1.89 A 0.5,0.5 0 1,1 17.77,23.43 a 4.45,4.45 0 0,0 0.89,1.55 A 0.5,0.5 0 0,1 18.62,25.68 Z m 0.04,-6.62 a 4.45,4.45 0 0,0-0.89,1.55 a 0.5,0.5 0 1,1-0.94,-0.31 a 5.45,5.45 0 0,1 1.09,-1.89 a 0.5,0.5 0 0,1 0.74,0.66 Z m 4.43,8.31 a 5.44,5.44 0 0,1-2.18,0 a 0.5,0.5 0 0,1 0.2,-0.97 a 4.47,4.47 0 0,0 1.79,0 a 0.5,0.5 0 0,1 0.2,0.97 Z m 0.39,-10.1 A 0.5,0.5 0 0,1 23,17.65 a 0.49,0.49 0 0,1-0.1,-0.01 a 4.47,4.47 0 0,0-1.79,0 a 0.5,0.5 0 1,1-0.2,-0.97 a 5.45,5.45 0 0,1 2.18,0 A 0.5,0.5 0 0,1 23.48,17.26 Z m 3.7,6.49 a 5.45,5.45 0 0,1-1.09,1.89 a 0.5,0.5 0 1,1-0.74,-0.66 a 4.45,4.45 0 0,0 0.89,-1.55 a 0.5,0.5 0 0,1 0.94,0.31 Z") }
- val SelectAdd by lazy { phosphor("selectadd", 44f, "M 26.12,17.02 L 17.88,17.02 A 0.82,0.82 0 0,0 17.06,17.84 L 17.06,26.07 a 0.82,0.82 0 0,0 0.82,0.82 L 26.12,26.9 a 0.82,0.82 0 0,0 0.82,-0.82 L 26.94,17.84 A 0.82,0.82 0 0,0 26.12,17.02 Z M 24.88,22.37 L 22.41,22.37 l 0,2.47 a 0.41,0.41 0 0,1-0.82,0 L 21.59,22.37 L 19.12,22.37 a 0.41,0.41 0 0,1 0,-0.82 l 2.47,0 L 21.59,19.08 a 0.41,0.41 0 0,1 0.82,0 l 0,2.47 l 2.47,0 a 0.41,0.41 0 0,1 0,0.82 Z") }
- val SelectRemove by lazy { phosphor("selectremove", 44f, "M 26.12,17.02 L 17.88,17.02 A 0.82,0.82 0 0,0 17.06,17.84 L 17.06,26.07 a 0.82,0.82 0 0,0 0.82,0.82 L 26.12,26.9 a 0.82,0.82 0 0,0 0.82,-0.82 L 26.94,17.84 A 0.82,0.82 0 0,0 26.12,17.02 Z M 24.88,22.37 L 19.12,22.37 a 0.41,0.41 0 0,1 0,-0.82 L 24.88,21.55 a 0.41,0.41 0 0,1 0,0.82 Z") }
- val Invert by lazy { phosphor("invert", 44f, "M 22,14 A 8,8 0 1,0 30,22 A 8.01,8.01 0 0,0 22,14 Z M 15.23,22 a 6.78,6.78 0 0,1 6.77,-6.77 L 22,28.77 A 6.78,6.78 0 0,1 15.23,22 Z") }
- val Feather by lazy { phosphor("feather", 44f, "M 29.7,23.09 l-6.07,6.14 l 0,0 a 1.6,1.6 0 0,1-1.14,0.48 L 15.84,29.71 L 12.82,32.73 a 0.81,0.81 0 0,1-1.15,-1.15 l 2.29,-2.29 l 0,0 L 20.85,22.4 L 29.41,22.4 A 0.41,0.41 0 0,1 29.7,23.09 Z M 30.2,12.51 a 6.5,6.5 0 0,0-8.72,0.42 l-0.98,0.96 A 0.41,0.41 0 0,0 20.37,14.17 l 0,6.4 l 5.59,-5.59 a 0.81,0.81 0 0,1 1.15,1.15 L 22.48,20.78 l 8.98,0 a 0.41,0.41 0 0,0 0.36,-0.22 A 6.51,6.51 0 0,0 30.2,12.51 Z M 14.57,26.39 L 18.75,22.2 L 18.75,16.59 a 0.41,0.41 0 0,0-0.69,-0.29 L 14.35,19.96 A 1.61,1.61 0 0,0 13.87,21.11 L 13.87,26.1 A 0.41,0.41 0 0,0 14.57,26.39 Z") }
+ val Automatic by lazy { ours("automatic", 44f, "M20.19 14.56L18.73 14.97L18.69 15.07L18.71 15.14L18.76 15.19L20.19 15.59L20.57 16.99L20.61 17.05L20.71 17.09L20.81 17.05L20.84 16.99L21.22 15.59L22.62 15.21L22.71 15.14L22.73 15.07L22.69 14.97L22.62 14.94L21.22 14.56L20.84 13.15L20.81 13.09L20.71 13.05L20.64 13.07L20.57 13.15ZM26.89 15.43L24.46 16.1L24.42 16.2L24.44 16.27L24.52 16.34L26.89 16.97L27.53 19.34L27.56 19.4L27.66 19.44L27.76 19.4L27.8 19.34L28.44 16.97L30.8 16.34L30.89 16.27L30.91 16.2L30.89 16.13L30.8 16.06L28.44 15.43L27.8 13.06L27.76 13L27.66 12.96L27.56 13L27.53 13.06ZM25.52 20.44L25.66 20.05L25.68 19.63L25.58 19.23L25.45 18.99L25.28 18.77L24.94 18.53L24.69 18.42L24.28 18.36L24 18.39L23.74 18.47L23.38 18.68L21.43 20.63L23.42 22.63L25.28 20.77ZM27.4 22.28L27.35 22.33L27.33 22.4L27.35 22.47L27.4 22.52L28.69 22.88L29.03 24.13L29.07 24.19L29.17 24.24L29.27 24.19L29.3 24.13L29.64 22.88L30.9 22.54L30.96 22.5L31 22.4L30.96 22.3L30.9 22.27L29.64 21.93L29.3 20.67L29.27 20.61L29.17 20.57L29.07 20.61L29.03 20.67L28.69 21.93ZM13.17 28.98L13.03 29.37L13 29.64L13.03 29.92L13.17 30.31L13.41 30.64L13.75 30.88L14 30.99L14.27 31.04L14.68 31.02L15.07 30.88L15.41 30.64L22.62 23.42L20.63 21.43L13.41 28.64Z") }
+ val Freehand by lazy { ours("freehand", 44f, "M29.92 17.33L29.78 16.95L29.6 16.58L29.39 16.22L29.14 15.89L28.55 15.28L27.86 14.76L27.08 14.34L26.22 14L25.31 13.76L24.3 13.61L23.3 13.56L22.8 13.57L21.82 13.65L20.81 13.82L19.77 14.08L18.85 14.41L18.38 14.61L17.5 15.06L16.63 15.61L15.9 16.2L15.29 16.81L14.96 17.2L14.52 17.87L14.32 18.24L14.12 18.71L14 19.11L13.86 19.83L13.84 20.24L13.87 20.74L14.02 21.44L14.2 21.91L14.55 22.55L14.86 22.95L15.39 23.49L15.78 23.8L16.29 24.13L16.02 25.31L16.04 25.68L16.2 26.02L17.16 27.11L15.85 28.8L15.71 29.06L15.65 29.34L15.67 29.63L15.78 29.9L15.89 30.06L16.04 30.2L16.2 30.3L16.38 30.37L16.58 30.4L16.87 30.38L17.05 30.31L17.22 30.22L17.43 30.01L19.24 27.67L19.34 27.5L19.41 27.32L19.44 27.12L19.43 26.93L19.35 26.65L19.19 26.4L18.09 25.16L18.15 24.89L19.16 25.1L19.64 25.16L20.59 25.21L21.65 25.17L22.63 25.05L23.17 24.95L24.13 24.7L24.66 24.53L25.56 24.17L26.01 23.95L26.48 23.69L27.26 23.19L28.04 22.57L28.65 21.97L29.19 21.27L29.62 20.53L29.82 20.06L29.94 19.66L30.03 19.26L30.1 18.53L30.07 18.03ZM28.11 18.51L28.07 18.94L28.02 19.17L27.84 19.65L27.71 19.89L27.38 20.38L27.18 20.63L26.7 21.11L26.43 21.34L25.81 21.77L25.48 21.98L24.75 22.35L24.37 22.51L23.57 22.79L23.16 22.91L22.32 23.09L21.47 23.19L20.63 23.22L19.82 23.18L19.16 23.08L19.1 22.82L18.89 22.42L18.75 22.25L18.38 21.98L17.95 21.84L17.5 21.84L17.07 21.98L16.85 22.12L16.52 21.83L16.22 21.46L16 21.08L15.88 20.68L15.83 20.27L15.87 19.83L16 19.36L16.1 19.12L16.38 18.63L16.56 18.39L16.99 17.9L17.24 17.66L17.81 17.21L18.13 17L18.82 16.6L19.19 16.42L19.96 16.11L20.37 15.98L21.2 15.76L21.62 15.68L22.05 15.62L22.89 15.55L23.31 15.55L24.12 15.59L24.51 15.64L25.25 15.79L25.59 15.89L26.23 16.13L26.51 16.27L27.01 16.59L27.23 16.76L27.58 17.12L27.72 17.31L27.94 17.69L28.06 18.09Z") }
+ val RectangleShape by lazy { ours("rectangleshape", 44f, "M17 17.23L17.23 17.13L17.42 16.96L17.55 16.74L17.61 16.49L17.6 16.24L17.51 16L17.36 15.8L17.16 15.65L16.92 15.57L16.75 15.55L14.69 15.55L14.52 15.57L14.28 15.65L14.08 15.8L13.97 15.93L13.9 16.08L13.83 16.33L13.83 18.47L13.85 18.64L13.93 18.88L14.14 19.14L14.44 19.3L14.77 19.33L15.1 19.23L15.35 19.02L15.48 18.8L15.53 18.64L15.55 17.27L16.75 17.27ZM21.21 17.2L21.43 17.07L21.6 16.89L21.7 16.66L21.74 16.41L21.7 16.16L21.55 15.86L21.36 15.69L21.13 15.59L20.88 15.55L18.65 15.57L18.41 15.65L18.21 15.8L18.1 15.93L18 16.16L17.96 16.49L18.06 16.82L18.27 17.07L18.57 17.23L18.82 17.27L20.88 17.27ZM15.51 20.29L15.41 20.06L15.24 19.87L14.94 19.72L14.69 19.68L14.44 19.72L14.14 19.87L13.97 20.06L13.87 20.29L13.83 20.54L13.85 22.77L13.93 23.01L14.08 23.21L14.28 23.36L14.44 23.42L14.77 23.46L15.1 23.36L15.35 23.15L15.51 22.85L15.55 22.6L15.55 20.54ZM15.48 24.34L15.35 24.12L15.17 23.95L14.94 23.84L14.69 23.81L14.44 23.84L14.28 23.91L14.08 24.06L13.93 24.26L13.85 24.5L13.83 24.67L13.83 26.73L13.9 27.06L14.03 27.28L14.28 27.49L14.52 27.57L14.77 27.59L15.04 27.52L15.07 27.84L15.23 28.14L15.49 28.35L15.73 28.43L18.04 28.45L18.29 28.38L18.5 28.25L18.62 28.14L18.75 27.92L18.8 27.76L18.81 27.51L18.78 27.34L18.67 27.11L18.5 26.93L18.36 26.83L18.13 26.75L17.96 26.73L15.89 26.73L15.73 26.75L15.55 26.8L15.55 24.67ZM19.77 26.77L19.54 26.87L19.36 27.04L19.2 27.34L19.16 27.59L19.2 27.84L19.36 28.14L19.54 28.31L19.77 28.41L20.02 28.45L22.25 28.43L22.49 28.35L22.63 28.25L22.8 28.07L22.91 27.84L22.94 27.51L22.84 27.18L22.63 26.93L22.34 26.77L22.09 26.73L20.02 26.73ZM25.34 17.2L25.56 17.07L25.73 16.89L25.83 16.66L25.87 16.41L25.83 16.16L25.67 15.86L25.49 15.69L25.26 15.59L25.01 15.55L22.78 15.57L22.54 15.65L22.4 15.75L22.23 15.93L22.12 16.16L22.09 16.49L22.19 16.82L22.4 17.07L22.7 17.23L22.95 17.27L25.01 17.27ZM29.47 17.2L29.68 17.07L29.85 16.89L29.96 16.66L30 16.41L29.96 16.16L29.8 15.86L29.62 15.69L29.39 15.59L29.14 15.55L26.91 15.57L26.74 15.62L26.53 15.75L26.36 15.93L26.25 16.16L26.22 16.49L26.32 16.82L26.53 17.07L26.82 17.23L27.07 17.27L29.14 17.27ZM28.52 20.7L28.65 20.91L28.83 21.08L29.06 21.19L29.31 21.23L29.56 21.19L29.86 21.03L30.03 20.84L30.13 20.62L30.17 20.37L30.15 18.13L30.07 17.9L29.97 17.76L29.79 17.59L29.56 17.48L29.23 17.45L28.9 17.54L28.65 17.76L28.49 18.05L28.45 18.3L28.45 20.37ZM28.52 24.82L28.65 25.04L28.83 25.21L29.06 25.32L29.31 25.35L29.56 25.32L29.86 25.16L30.03 24.97L30.13 24.74L30.17 24.49L30.15 22.26L30.07 22.02L29.97 21.88L29.79 21.71L29.56 21.61L29.23 21.57L28.9 21.67L28.65 21.88L28.49 22.18L28.45 22.43L28.45 24.49ZM27.48 27.26L27.42 27.51L27.43 27.76L27.52 28L27.67 28.2L27.87 28.35L28.11 28.43L28.36 28.45L28.61 28.38L28.89 28.2L30.03 27.04L30.13 26.81L30.17 26.64L30.15 26.39L30.1 26.23L29.92 25.95L29.64 25.76L29.31 25.7L28.98 25.76L28.7 25.95L27.67 26.98ZM23.82 26.8L23.6 26.93L23.43 27.11L23.33 27.34L23.29 27.59L23.33 27.84L23.49 28.14L23.67 28.31L23.9 28.41L24.15 28.45L26.38 28.43L26.62 28.35L26.76 28.25L26.93 28.07L27.04 27.84L27.07 27.51L26.97 27.18L26.76 26.93L26.46 26.77L26.21 26.73L24.15 26.73Z") }
+ val EllipseShape by lazy { ours("ellipseshape", 44f, "M22.75 17.24L23.03 17.06L23.19 16.86L23.29 16.63L23.31 16.38L23.26 16.13L23.13 15.91L22.88 15.69L22.65 15.59L22.4 15.57L20.17 15.72L19.94 15.82L19.74 15.98L19.61 16.19L19.55 16.35L19.54 16.69L19.65 17.01L19.88 17.25L20.19 17.39L20.44 17.41L22.5 17.29ZM26.31 18.39L26.65 18.36L26.87 18.25L27.06 18.08L27.19 17.86L27.25 17.53L27.22 17.28L27.11 17.05L26.94 16.86L26.72 16.74L24.65 15.91L24.4 15.9L24.15 15.96L24 16.04L23.82 16.21L23.66 16.51L23.63 16.84L23.73 17.16L23.94 17.42L24.16 17.55L26.07 18.33ZM19.05 17.71L19.19 17.49L19.26 17.25L19.26 17L19.14 16.68L18.98 16.49L18.69 16.32L18.45 16.27L18.19 16.29L17.96 16.39L16.06 17.56L15.95 17.69L15.83 17.91L15.78 18.16L15.81 18.41L15.96 18.71L16.21 18.94L16.52 19.05L16.86 19.03L17.09 18.93L18.85 17.87ZM28.57 21.27L28.75 21.37L28.58 21.57L28.48 21.8L27.99 23.79L27.97 24.04L28.05 24.37L28.25 24.64L28.54 24.81L28.88 24.86L29.12 24.81L29.35 24.69L29.47 24.57L29.61 24.36L30.16 22.21L30.17 21.88L30.13 21.71L30.01 21.49L29.83 21.31L29.65 21.21L29.82 21.01L29.91 20.77L29.93 20.52L29.88 20.27L28.73 18.37L28.51 18.12L28.28 18.01L28.03 17.96L27.78 17.99L27.48 18.13L27.26 18.38L27.15 18.7L27.17 19.04L27.26 19.27L28.34 21.02ZM16.16 19.67L16.1 19.43L15.97 19.21L15.71 18.99L15.47 18.91L15.22 18.89L14.98 18.95L14.76 19.08L14.59 19.27L14.48 19.5L13.84 21.62L13.84 21.79L13.9 22.03L14.03 22.25L14.21 22.42L14.52 22.55L14.86 22.55L15.17 22.43L15.41 22.19L15.52 21.96L16.12 20.01ZM15.58 23.05L15.36 22.92L15.12 22.87L14.86 22.88L14.63 22.97L14.42 23.12L14.28 23.32L14.19 23.56L14.19 23.9L14.32 24.21L15.53 25.97L15.65 26.09L15.87 26.22L16.11 26.28L16.36 26.27L16.67 26.14L16.91 25.9L17.04 25.59L17.03 25.25L16.9 24.94L15.75 23.24ZM25.19 26.21L25.03 26.5L24.99 26.75L25.03 27L25.14 27.23L25.31 27.42L25.6 27.58L25.85 27.62L26.1 27.58L26.33 27.48L28.18 26.23L28.33 26.03L28.42 25.79L28.43 25.54L28.4 25.38L28.24 25.08L27.98 24.86L27.66 24.76L27.33 24.8L27.1 24.9L25.38 26.04ZM17.84 25.76L17.59 25.81L17.36 25.92L17.13 26.17L17.03 26.4L17.01 26.65L17.05 26.9L17.17 27.12L17.34 27.31L17.57 27.43L19.66 28.19L19.83 28.2L20.08 28.16L20.3 28.04L20.48 27.86L20.63 27.56L20.65 27.22L20.54 26.91L20.32 26.65L20.1 26.53L18.17 25.81ZM21.44 26.84L21.18 27.05L21.05 27.27L20.99 27.51L21 27.76L21.08 28L21.23 28.21L21.43 28.36L21.67 28.45L21.92 28.46L24.14 28.24L24.37 28.14L24.56 27.97L24.69 27.75L24.74 27.59L24.75 27.25L24.62 26.94L24.38 26.7L24.08 26.57L23.82 26.56L21.77 26.74Z") }
+ val SelectAdd by lazy { ours("selectadd", 44f, "M30.23 21.42L30.09 20.36L29.97 19.83L29.63 18.81L29.4 18.32L28.86 17.38L28.55 16.95L27.84 16.13L27.44 15.77L26.59 15.11L26.13 14.82L25.65 14.57L24.66 14.16L23.62 13.88L23.08 13.79L22.01 13.72L21.47 13.74L20.93 13.79L19.88 14L18.85 14.35L18.36 14.57L17.43 15.11L16.99 15.42L16.18 16.13L15.81 16.53L15.47 16.95L14.87 17.84L14.62 18.32L14.2 19.31L13.92 20.36L13.84 20.89L13.77 21.96L13.78 22.5L13.92 23.57L14.05 24.1L14.2 24.61L14.62 25.61L15.15 26.54L15.47 26.98L15.81 27.4L16.57 28.16L17.43 28.82L17.89 29.1L18.85 29.58L19.36 29.77L19.88 29.93L20.93 30.14L21.47 30.19L22.55 30.19L23.08 30.14L24.14 29.93L24.66 29.77L25.65 29.36L26.59 28.82L27.03 28.5L27.84 27.79L28.21 27.4L28.55 26.98L29.15 26.09L29.4 25.61L29.82 24.61L29.97 24.1L30.18 23.04L30.23 22.5ZM26.41 23.06L23.11 23.06L23.11 26.36L23.06 26.68L22.92 26.97L22.79 27.14L22.62 27.27L22.33 27.41L22.12 27.45L21.9 27.45L21.59 27.38L21.31 27.21L21.16 27.06L21.04 26.88L20.93 26.57L20.91 26.36L20.91 23.06L17.61 23.06L17.29 23.02L17 22.88L16.83 22.74L16.7 22.57L16.6 22.38L16.53 22.18L16.52 21.86L16.56 21.64L16.64 21.45L16.83 21.19L17.09 20.99L17.4 20.89L17.61 20.86L20.91 20.86L20.91 17.57L20.96 17.25L21.04 17.05L21.16 16.87L21.4 16.65L21.59 16.55L21.79 16.49L22.12 16.47L22.43 16.55L22.62 16.65L22.79 16.79L22.98 17.05L23.09 17.35L23.11 17.57L23.11 20.86L26.51 20.87L26.72 20.91L26.92 20.99L27.1 21.11L27.32 21.35L27.46 21.64L27.5 21.86L27.48 22.18L27.37 22.48L27.26 22.66L27.02 22.88L26.72 23.02Z") }
+ val SelectRemove by lazy { ours("selectremove", 44f, "M30.23 21.42L30.09 20.36L29.97 19.83L29.63 18.81L29.4 18.32L28.86 17.38L28.55 16.95L27.84 16.13L27.44 15.77L26.59 15.11L26.13 14.82L25.65 14.57L24.66 14.16L23.62 13.88L23.08 13.79L22.01 13.72L21.47 13.74L20.93 13.79L19.88 14L18.85 14.35L18.36 14.57L17.43 15.11L16.99 15.42L16.18 16.13L15.81 16.53L15.47 16.95L14.87 17.84L14.62 18.32L14.2 19.31L13.92 20.36L13.84 20.89L13.77 21.96L13.78 22.5L13.92 23.57L14.05 24.1L14.2 24.61L14.62 25.61L15.15 26.54L15.47 26.98L15.81 27.4L16.57 28.16L17.43 28.82L17.89 29.1L18.85 29.58L19.36 29.77L19.88 29.93L20.93 30.14L21.47 30.19L22.55 30.19L23.08 30.14L24.14 29.93L24.66 29.77L25.65 29.36L26.59 28.82L27.03 28.5L27.84 27.79L28.21 27.4L28.55 26.98L29.15 26.09L29.4 25.61L29.82 24.61L29.97 24.1L30.18 23.04L30.23 22.5ZM17.61 23.06L17.4 23.04L17.19 22.98L17 22.88L16.83 22.74L16.7 22.57L16.6 22.38L16.53 22.18L16.51 21.96L16.53 21.75L16.6 21.54L16.76 21.27L16.91 21.11L17.09 20.99L17.29 20.91L17.5 20.87L26.51 20.87L26.83 20.95L27.02 21.05L27.18 21.19L27.37 21.45L27.46 21.64L27.5 21.86L27.5 22.07L27.46 22.28L27.37 22.48L27.26 22.66L27.1 22.81L26.92 22.93L26.72 23.02L26.51 23.06Z") }
+ val Invert by lazy { ours("invert", 44f, "M29.85 20.44L29.66 19.68L29.39 18.94L29.06 18.23L28.65 17.56L28.18 16.92L27.66 16.34L27.08 15.82L26.44 15.35L25.77 14.94L25.06 14.61L24.32 14.34L23.56 14.15L22.78 14.04L22 14L21.22 14.04L20.44 14.15L19.68 14.34L18.94 14.61L18.23 14.94L17.56 15.35L16.92 15.82L16.34 16.34L15.82 16.92L15.35 17.56L14.94 18.23L14.61 18.94L14.34 19.68L14.15 20.44L14.04 21.22L14 22L14.04 22.78L14.15 23.56L14.34 24.32L14.61 25.06L14.94 25.77L15.35 26.44L15.82 27.08L16.34 27.66L16.92 28.18L17.56 28.65L18.23 29.06L18.94 29.39L19.68 29.66L20.44 29.85L21.22 29.96L22 30L22.78 29.96L23.56 29.85L24.32 29.66L25.06 29.39L25.77 29.06L26.44 28.65L27.08 28.18L27.66 27.66L28.18 27.08L28.65 26.44L29.06 25.77L29.39 25.06L29.66 24.32L29.85 23.56L29.96 22.78L30 22L29.96 21.22ZM21.39 28.19L20.79 28.1L20.19 27.95L19.62 27.75L19.07 27.49L18.54 27.17L18.05 26.81L17.6 26.4L17.19 25.95L16.83 25.46L16.51 24.93L16.25 24.38L16.05 23.81L15.9 23.21L15.81 22.61L15.78 22L15.81 21.39L15.9 20.79L16.05 20.19L16.25 19.62L16.51 19.07L16.83 18.54L17.19 18.05L17.6 17.6L18.05 17.19L18.54 16.83L19.07 16.51L19.62 16.25L20.19 16.05L20.79 15.9L21.39 15.81L22 15.78L22 28.22Z") }
+ val Feather by lazy { ours("feather", 44f, "M30.77 11.33L28.31 12.1L27.13 12.54L26.01 13.04L24.95 13.6L23.95 14.23L23.03 14.92L22.18 15.7L21.4 16.54L20.68 17.5L20.06 18.49L19.5 19.55L19 20.67L18.56 21.85L18.15 23.07L17.57 25.13L17.12 25.19L16.66 25.44L11.33 30.77L11.12 31.11L11.02 31.62L11.12 32.14L11.42 32.58L11.74 32.82L12.24 32.97L12.64 32.95L13.13 32.75L18.47 27.44L18.77 27L18.84 26.75L18.87 26.43L20.93 25.84L22.17 25.44L23.32 25L24.45 24.5L25.51 23.94L26.5 23.31L27.43 22.62L28.28 21.84L29.05 21L29.75 20.07L30.38 19.08L30.95 18.01L31.45 16.89L31.9 15.71L32.3 14.48L32.98 12.07L18.84 26.21L18.71 25.84L18.47 25.53L18.15 25.29L17.79 25.16L31.93 11.02Z") }
/** A ring of short arcs around the feather icon's dot. */
private val FEATHER_RING = buildString {
val arcs = 12
@@ -655,9 +655,9 @@ object PcIcons {
append("A$r $r 0 0 1 ${12f + r * kotlin.math.cos(a1).toFloat()} ${12f + r * kotlin.math.sin(a1).toFloat()}")
}
}
- val SaveLoad by lazy { phosphor("saveload", 44f, "M 30.51,16.72 L 27.21,13.43 A 1.48,1.48 0 0,0 26.16,12.99 L 14.52,12.99 A 1.49,1.49 0 0,0 13.03,14.48 L 13.03,29.41 a 1.49,1.49 0 0,0 1.49,1.49 L 29.45,30.91 a 1.49,1.49 0 0,0 1.49,-1.49 L 30.95,17.78 A 1.48,1.48 0 0,0 30.51,16.72 Z M 29.45,29.41 L 27.21,29.41 L 27.21,24.19 a 1.49,1.49 0 0,0-1.49,-1.49 L 18.25,22.69 a 1.49,1.49 0 0,0-1.49,1.49 l 0,5.23 L 14.52,29.41 L 14.52,14.48 L 26.16,14.48 L 29.45,17.78 Z M 24.97,16.72 a 0.75,0.75 0 0,1-0.75,0.75 L 19,17.47 a 0.75,0.75 0 0,1 0,-1.49 l 5.23,0 A 0.75,0.75 0 0,1 24.97,16.72 Z") }
- val ColorFill by lazy { phosphor("colorfill", 44f, "M 31,28.37 a 1.74,1.74 0 0,1-3.49,0 c 0,-1.3 1.13,-3.03 1.26,-3.23 a 0.58,0.58 0 0,1 0.97,0 C 29.87,25.34 31,27.07 31,28.37 Z M 22.03,22.31 a 0.87,0.87 0 0,0-1.23,-1.23 l 0,0 s 0,0 0,0 a 0.87,0.87 0 0,0 1.23,1.23 Z M 15.14,14.6 A 0.58,0.58 0 0,0 14.32,15.43 l 2.37,2.37 L 17.51,16.98 Z M 29.44,23.37 a 0.58,0.58 0 0,0 0.23,-0.96 L 21.28,14.02 a 0.58,0.58 0 0,0-0.82,0 L 17.51,16.98 l 2.94,2.93 a 2.03,2.03 0 1,1-0.82,0.82 L 16.69,17.79 L 13.5,20.98 a 1.74,1.74 0 0,0 0,2.46 L 19.66,29.61 a 1.74,1.74 0 0,0 2.46,0 l 5.7,-5.7 Z") }
- val ClearSelection by lazy { phosphor("clearselection", 44f, "M 30.82,30.23 C 28.91,29.29 27.81,27.28 27.81,24.71 L 27.81,23.24 a 1.36,1.36 0 0,0-0.86,-1.27 l-2.44,-0.98 A 0.68,0.68 0 0,1 24.12,20.1 l 1.9,-4.84 C 26.45,14.2 25.93,12.95 24.85,12.55 a 2.05,2.05 0 0,0-2.62,1.17 L 20.32,18.58 a 0.68,0.68 0 0,1-0.89,0.38 L 16.98,17.98 a 1.36,1.36 0 0,0-1.48,0.31 C 13.7,20.14 12.79,22.3 12.79,24.71 a 9.52,9.52 0 0,0 2.66,6.62 A 0.69,0.69 0 0,0 15.95,31.54 L 30.54,31.54 a 0.68,0.68 0 0,0 0.68,-0.64 A 0.7,0.7 0 0,0 30.82,30.23 Z M 20.57,30.17 a 7.47,7.47 0 0,1-2.07,-3.56 a 0.7,0.7 0 0,0-0.79,-0.53 A 0.68,0.68 0 0,0 17.17,26.93 a 8.99,8.99 0 0,0 1.57,3.24 L 16.24,30.17 A 8.16,8.16 0 0,1 14.16,24.71 a 7.33,7.33 0 0,1 0.66,-3.1 l 11.76,4.7 c 0.26,1.54 0.9,2.86 1.87,3.86 Z") }
+ val SaveLoad by lazy { ours("saveload", 44f, "M23.12 14.13L23.1 13.91L23.04 13.69L22.86 13.41L22.62 13.18L22.42 13.08L22.21 13.01L21.98 12.99L21.76 13.01L21.45 13.12L21.26 13.25L21.11 13.41L20.98 13.59L20.9 13.8L20.85 14.13L20.85 21.62L18.06 21.63L17.93 21.68L17.82 21.78L17.76 21.99L17.78 22.14L17.86 22.26L21.71 26.26L21.84 26.35L21.98 26.38L22.13 26.35L22.26 26.26L26.11 22.26L26.21 22.07L26.21 21.92L26.15 21.78L26.04 21.68L25.91 21.63L23.12 21.62ZM13.28 29.99L13.35 30.21L13.45 30.4L13.68 30.65L13.96 30.82L14.29 30.9L29.57 30.91L29.79 30.89L30.01 30.82L30.29 30.65L30.52 30.4L30.66 30.1L30.7 29.88L30.71 22.66L30.69 22.44L30.62 22.23L30.45 21.94L30.2 21.72L29.9 21.57L29.68 21.53L29.46 21.53L29.13 21.61L28.85 21.78L28.62 22.03L28.48 22.33L28.43 22.66L28.43 28.63L15.54 28.63L15.54 22.66L15.52 22.44L15.45 22.23L15.28 21.94L15.12 21.78L14.94 21.66L14.73 21.57L14.51 21.53L14.29 21.53L13.96 21.61L13.68 21.78L13.52 21.94L13.35 22.23L13.27 22.55L13.26 29.77Z") }
+ val ColorFill by lazy { ours("colorfill", 44f, "M23.31 14.04L23.43 13.91L23.53 13.68L23.54 13.44L23.45 13.22L23.28 13.04L23.06 12.94L22.88 12.93L22.65 12.99L13.28 18.92L13.14 19.04L13.02 19.25L12.99 19.43L13.03 19.67L13.16 19.88L13.3 19.99L13.47 20.05L13.72 20.06L13.89 20L14.09 19.88L14.16 20.28L14.27 20.5L18.64 27.4L18.79 27.59L18.97 27.75L19.19 27.87L19.42 27.95L19.66 27.98L19.9 27.96L20.14 27.9L20.35 27.79L27.57 23.22L27.76 23.07L27.92 22.88L28.04 22.67L28.12 22.44L28.15 22.2L28.13 21.96L28.07 21.72L27.96 21.5L24.58 16.17L24.5 16.3L24.37 16.41L16.09 21.69L15.88 21.77L15.66 21.76L15.46 21.67L15.3 21.51L15.22 21.31L15.23 21.08L15.32 20.88L15.48 20.73L23.76 15.45L23.91 15.38L24.07 15.36L23.44 14.41L23.11 14.17ZM28.79 24.32L28.64 24.42L26.82 28.04L26.73 28.3L26.65 28.87L26.73 29.43L26.82 29.7L26.94 29.95L27.29 30.4L27.74 30.75L27.99 30.88L28.26 30.97L28.83 31.04L29.39 30.97L29.66 30.88L30.15 30.59L30.36 30.4L30.71 29.95L30.83 29.7L30.93 29.43L31 28.87L30.93 28.3L30.83 28.04L29.01 24.42L28.91 24.33Z") }
+ val ClearSelection by lazy { ours("clearselection", 44f, "M28.97 31.18L29.37 31.42L29.67 31.51L29.98 31.54L30.29 31.51L30.59 31.42L30.99 31.18L31.21 30.96L31.38 30.7L31.54 30.26L31.57 29.95L31.54 29.64L31.38 29.2L31.1 28.82L24.26 21.98L31.21 15.02L31.45 14.62L31.54 14.32L31.57 14.01L31.54 13.7L31.45 13.4L31.21 13L30.99 12.78L30.73 12.61L30.44 12.49L30.13 12.43L29.82 12.43L29.51 12.49L29.09 12.69L28.85 12.89L22.01 19.73L15.05 12.78L14.65 12.54L14.35 12.45L14.04 12.42L13.73 12.45L13.43 12.54L13.03 12.78L12.81 13L12.64 13.26L12.48 13.7L12.45 14.01L12.48 14.32L12.57 14.62L12.72 14.9L12.92 15.14L19.76 21.98L12.81 28.94L12.57 29.34L12.48 29.64L12.45 29.95L12.48 30.26L12.57 30.56L12.81 30.96L13.03 31.18L13.29 31.35L13.73 31.51L14.04 31.54L14.35 31.51L14.65 31.42L14.93 31.27L15.17 31.07L22.01 24.23Z") }
/** A disc with a ring of short rays, for selecting by colour. */
private val AUTOMATIC = buildString {
val rays = 16
diff --git a/assets/icons/procraft/automatic.svg b/assets/icons/procraft/automatic.svg
new file mode 100644
index 0000000..2a611ca
--- /dev/null
+++ b/assets/icons/procraft/automatic.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft automatic icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M10.65 3.45L9.09 3.89L9.05 4L9.07 4.07L9.12 4.13L10.65 4.55L11.06 6.04L11.09 6.11L11.2 6.15L11.31 6.11L11.34 6.04L11.75 4.55L13.24 4.14L13.33 4.07L13.35 4L13.31 3.89L13.24 3.86L11.75 3.45L11.34 1.96L11.31 1.89L11.2 1.85L11.13 1.87L11.06 1.96ZM17.78 4.38L15.19 5.09L15.15 5.2L15.17 5.27L15.26 5.34L17.78 6.02L18.46 8.54L18.49 8.61L18.6 8.65L18.71 8.61L18.74 8.54L19.42 6.02L21.94 5.34L22.03 5.27L22.05 5.2L22.03 5.13L21.94 5.06L19.42 4.38L18.74 1.86L18.71 1.79L18.6 1.75L18.49 1.79L18.46 1.86ZM16.32 9.71L16.47 9.29L16.49 8.85L16.39 8.43L16.25 8.17L16.06 7.94L15.71 7.68L15.44 7.56L15 7.5L14.71 7.53L14.43 7.61L14.05 7.84L11.96 9.92L14.08 12.04L16.06 10.06ZM18.32 11.67L18.27 11.73L18.25 11.8L18.27 11.87L18.32 11.93L19.7 12.3L20.06 13.64L20.09 13.71L20.2 13.75L20.31 13.71L20.34 13.64L20.7 12.3L22.04 11.94L22.11 11.91L22.15 11.8L22.11 11.69L22.04 11.66L20.7 11.3L20.34 9.96L20.31 9.89L20.2 9.85L20.09 9.89L20.06 9.96L19.7 11.3ZM3.18 18.79L3.03 19.21L3 19.5L3.03 19.79L3.18 20.21L3.44 20.56L3.79 20.82L4.06 20.94L4.35 20.99L4.79 20.97L5.21 20.82L5.56 20.56L13.24 12.88L11.12 10.76L3.44 18.44Z"/>
+</svg>
diff --git a/assets/icons/procraft/clearselection.svg b/assets/icons/procraft/clearselection.svg
new file mode 100644
index 0000000..2a6758a
--- /dev/null
+++ b/assets/icons/procraft/clearselection.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft clearselection icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M17.68 19.5L18 19.7L18.25 19.78L18.5 19.8L18.75 19.78L19 19.7L19.32 19.5L19.5 19.32L19.65 19.11L19.78 18.75L19.8 18.5L19.78 18.25L19.65 17.89L19.42 17.58L13.84 12L19.5 6.32L19.7 6L19.78 5.75L19.8 5.5L19.78 5.25L19.7 5L19.5 4.68L19.32 4.5L19.11 4.35L18.88 4.26L18.63 4.21L18.37 4.21L18.12 4.26L17.78 4.42L17.58 4.58L12 10.16L6.32 4.5L6 4.3L5.75 4.22L5.5 4.2L5.25 4.22L5 4.3L4.68 4.5L4.5 4.68L4.35 4.89L4.22 5.25L4.2 5.5L4.22 5.75L4.3 6L4.42 6.22L4.58 6.42L10.16 12L4.5 17.68L4.3 18L4.22 18.25L4.2 18.5L4.22 18.75L4.3 19L4.5 19.32L4.68 19.5L4.89 19.65L5.25 19.78L5.5 19.8L5.75 19.78L6 19.7L6.22 19.58L6.42 19.42L12 13.84Z"/>
+</svg>
diff --git a/assets/icons/procraft/colorfill.svg b/assets/icons/procraft/colorfill.svg
new file mode 100644
index 0000000..47d8bd4
--- /dev/null
+++ b/assets/icons/procraft/colorfill.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft colorfill icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M13.87 4.27L13.99 4.15L14.09 3.93L14.09 3.7L14.01 3.48L13.85 3.31L13.63 3.21L13.46 3.2L13.23 3.26L4.18 8.99L4.05 9.11L3.93 9.31L3.9 9.49L3.94 9.72L4.07 9.91L4.2 10.02L4.37 10.09L4.6 10.09L4.77 10.04L4.96 9.92L5.04 10.3L5.14 10.51L9.36 17.18L9.5 17.37L9.68 17.52L9.89 17.64L10.11 17.71L10.34 17.74L10.58 17.73L10.8 17.66L11.01 17.56L17.99 13.14L18.17 13L18.33 12.82L18.44 12.61L18.52 12.39L18.54 12.16L18.53 11.92L18.46 11.7L18.36 11.49L15.1 6.33L15.02 6.46L14.9 6.56L6.9 11.66L6.7 11.74L6.48 11.74L6.28 11.65L6.14 11.5L6.06 11.3L6.06 11.08L6.15 10.88L6.3 10.74L14.3 5.64L14.45 5.57L14.61 5.55L14 4.63L13.68 4.4ZM19.16 14.2L19.02 14.31L17.26 17.8L17.17 18.06L17.1 18.6L17.17 19.14L17.26 19.4L17.38 19.65L17.72 20.08L18.15 20.42L18.4 20.54L18.66 20.63L19.2 20.7L19.74 20.63L20 20.54L20.48 20.27L20.68 20.08L21.02 19.65L21.14 19.4L21.23 19.14L21.3 18.6L21.23 18.06L21.14 17.8L19.38 14.31L19.28 14.22Z"/>
+</svg>
diff --git a/assets/icons/procraft/ellipseshape.svg b/assets/icons/procraft/ellipseshape.svg
new file mode 100644
index 0000000..cb3c11f
--- /dev/null
+++ b/assets/icons/procraft/ellipseshape.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft ellipseshape icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M12.87 6.46L13.2 6.26L13.39 6.03L13.5 5.76L13.52 5.47L13.46 5.18L13.32 4.92L13.03 4.66L12.76 4.55L12.46 4.53L9.88 4.7L9.61 4.82L9.39 5.01L9.23 5.25L9.16 5.44L9.15 5.83L9.28 6.19L9.55 6.48L9.9 6.64L10.2 6.67L12.58 6.52ZM17.01 7.8L17.4 7.76L17.66 7.64L17.88 7.44L18.03 7.19L18.1 6.8L18.06 6.51L17.93 6.25L17.73 6.03L17.48 5.88L15.08 4.92L14.79 4.91L14.5 4.98L14.33 5.07L14.11 5.27L13.93 5.61L13.89 6L14.01 6.38L14.26 6.68L14.51 6.83L16.72 7.73ZM8.58 7.01L8.74 6.76L8.83 6.48L8.83 6.19L8.69 5.82L8.5 5.59L8.17 5.4L7.88 5.34L7.59 5.37L7.32 5.48L5.12 6.84L4.99 6.98L4.85 7.24L4.79 7.53L4.82 7.82L4.99 8.18L5.28 8.44L5.65 8.57L6.04 8.55L6.31 8.43L8.35 7.19ZM19.63 11.14L19.83 11.25L19.64 11.49L19.53 11.76L18.96 14.07L18.93 14.36L19.03 14.74L19.26 15.05L19.6 15.25L19.98 15.31L20.27 15.25L20.53 15.11L20.68 14.98L20.84 14.73L21.47 12.24L21.49 11.85L21.44 11.66L21.3 11.4L21.09 11.19L20.88 11.08L21.08 10.84L21.19 10.56L21.21 10.27L21.15 9.98L19.82 7.78L19.55 7.49L19.29 7.35L19.01 7.3L18.71 7.33L18.36 7.5L18.1 7.79L17.98 8.16L18 8.55L18.12 8.82L19.36 10.85ZM5.23 9.29L5.16 9L5.01 8.75L4.71 8.5L4.43 8.4L4.14 8.39L3.85 8.46L3.6 8.61L3.4 8.82L3.28 9.09L2.54 11.55L2.53 11.74L2.6 12.03L2.75 12.28L2.97 12.48L3.33 12.63L3.72 12.63L4.08 12.49L4.36 12.21L4.49 11.95L5.19 9.68ZM4.56 13.21L4.3 13.06L4.02 12.99L3.72 13.01L3.45 13.11L3.21 13.29L3.04 13.52L2.94 13.8L2.95 14.19L3.1 14.55L4.49 16.6L4.63 16.74L4.89 16.89L5.17 16.96L5.47 16.94L5.82 16.79L6.1 16.51L6.25 16.15L6.24 15.76L6.09 15.4L4.75 13.43ZM15.71 16.87L15.52 17.22L15.48 17.51L15.52 17.8L15.65 18.06L15.84 18.28L16.18 18.47L16.47 18.51L16.77 18.47L17.03 18.35L19.18 16.9L19.35 16.67L19.45 16.39L19.47 16.1L19.43 15.91L19.25 15.56L18.95 15.31L18.57 15.2L18.19 15.24L17.92 15.36L15.93 16.68ZM7.17 16.35L6.88 16.41L6.62 16.54L6.36 16.83L6.24 17.1L6.21 17.39L6.26 17.68L6.4 17.94L6.6 18.15L6.86 18.29L9.29 19.17L9.49 19.19L9.78 19.13L10.04 19L10.25 18.79L10.42 18.44L10.44 18.05L10.31 17.68L10.06 17.39L9.8 17.25L7.56 16.42ZM11.36 17.61L11.06 17.85L10.9 18.1L10.83 18.39L10.84 18.68L10.94 18.96L11.11 19.19L11.35 19.37L11.62 19.47L11.92 19.49L14.49 19.23L14.76 19.11L14.98 18.92L15.13 18.67L15.19 18.48L15.19 18.09L15.05 17.73L14.77 17.45L14.41 17.3L14.12 17.28L11.74 17.5Z"/>
+</svg>
diff --git a/assets/icons/procraft/feather.svg b/assets/icons/procraft/feather.svg
new file mode 100644
index 0000000..0c8ca27
--- /dev/null
+++ b/assets/icons/procraft/feather.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft feather icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M17.6 5L15.78 5.57L14.91 5.9L14.08 6.27L13.29 6.68L12.56 7.14L11.88 7.66L11.25 8.23L10.67 8.86L10.14 9.56L9.68 10.29L9.27 11.08L8.9 11.91L8.57 12.78L8.27 13.68L7.84 15.2L7.51 15.24L7.17 15.43L3.23 19.37L3.08 19.62L3 20L3.08 20.38L3.29 20.71L3.53 20.88L3.9 21L4.2 20.98L4.56 20.83L8.51 16.91L8.72 16.58L8.78 16.4L8.8 16.16L10.32 15.73L11.24 15.43L12.09 15.1L12.92 14.73L13.71 14.32L14.44 13.86L15.12 13.34L15.75 12.77L16.33 12.14L16.84 11.46L17.31 10.73L17.73 9.94L18.1 9.11L18.43 8.24L18.73 7.33L19.23 5.55L8.78 16L8.68 15.73L8.51 15.49L8.27 15.32L8 15.22L18.45 4.77Z"/>
+</svg>
diff --git a/assets/icons/procraft/freehand.svg b/assets/icons/procraft/freehand.svg
new file mode 100644
index 0000000..f752229
--- /dev/null
+++ b/assets/icons/procraft/freehand.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft freehand icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M21.3 7.23L21.15 6.8L20.95 6.39L20.71 6L20.44 5.63L19.79 4.96L19.03 4.38L18.16 3.91L17.21 3.54L16.2 3.27L15.08 3.11L13.98 3.05L13.42 3.06L12.34 3.15L11.21 3.33L10.06 3.63L9.04 3.99L8.53 4.21L7.55 4.71L6.59 5.32L5.77 5.97L5.1 6.64L4.74 7.08L4.25 7.82L4.03 8.24L3.81 8.75L3.67 9.19L3.52 9.99L3.5 10.44L3.53 11L3.7 11.77L3.9 12.3L4.29 13L4.62 13.45L5.21 14.04L5.64 14.39L6.2 14.75L5.91 16.06L5.93 16.47L6.11 16.85L7.17 18.05L5.73 19.93L5.57 20.21L5.5 20.53L5.53 20.85L5.65 21.15L5.77 21.32L5.93 21.47L6.11 21.59L6.31 21.66L6.53 21.7L6.85 21.67L7.05 21.6L7.24 21.49L7.47 21.27L9.47 18.67L9.59 18.49L9.66 18.28L9.7 18.07L9.69 17.85L9.6 17.54L9.42 17.27L8.2 15.89L8.27 15.6L9.39 15.83L9.92 15.89L10.97 15.95L12.15 15.91L13.23 15.77L13.83 15.66L14.89 15.38L15.47 15.19L16.47 14.79L16.97 14.55L17.5 14.27L18.36 13.72L19.23 13.03L19.9 12.36L20.5 11.59L20.97 10.76L21.19 10.25L21.33 9.81L21.43 9.36L21.5 8.56L21.47 8ZM19.3 8.53L19.26 9.01L19.2 9.26L19 9.79L18.86 10.06L18.5 10.6L18.27 10.87L17.74 11.41L17.44 11.66L16.76 12.15L16.38 12.37L15.58 12.78L15.16 12.96L14.27 13.27L13.82 13.4L12.88 13.6L11.94 13.72L11.02 13.75L10.12 13.7L9.38 13.59L9.32 13.31L9.09 12.86L8.93 12.67L8.53 12.37L8.05 12.22L7.55 12.22L7.07 12.37L6.83 12.53L6.47 12.21L6.13 11.8L5.89 11.37L5.75 10.93L5.7 10.47L5.74 9.99L5.89 9.48L6 9.21L6.31 8.67L6.5 8.4L6.98 7.86L7.26 7.59L7.89 7.09L8.24 6.85L9.01 6.42L9.42 6.22L10.28 5.87L10.73 5.73L11.65 5.49L12.12 5.4L12.59 5.33L13.52 5.26L13.98 5.25L14.88 5.3L15.31 5.35L16.13 5.52L16.51 5.63L17.21 5.9L17.53 6.05L18.08 6.4L18.32 6.59L18.71 6.99L18.87 7.2L19.11 7.63L19.25 8.07Z"/>
+</svg>
diff --git a/assets/icons/procraft/invert.svg b/assets/icons/procraft/invert.svg
new file mode 100644
index 0000000..3f70be4
--- /dev/null
+++ b/assets/icons/procraft/invert.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft invert icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M20.83 10.24L20.61 9.39L20.31 8.56L19.94 7.76L19.48 7L18.96 6.29L18.36 5.64L17.71 5.04L17 4.52L16.24 4.06L15.44 3.69L14.61 3.39L13.76 3.17L12.88 3.04L12 3L11.12 3.04L10.24 3.17L9.39 3.39L8.56 3.69L7.76 4.06L7 4.52L6.29 5.04L5.64 5.64L5.04 6.29L4.52 7L4.06 7.76L3.69 8.56L3.39 9.39L3.17 10.24L3.04 11.12L3 12L3.04 12.88L3.17 13.76L3.39 14.61L3.69 15.44L4.06 16.24L4.52 17L5.04 17.71L5.64 18.36L6.29 18.96L7 19.48L7.76 19.94L8.56 20.31L9.39 20.61L10.24 20.83L11.12 20.96L12 21L12.88 20.96L13.76 20.83L14.61 20.61L15.44 20.31L16.24 19.94L17 19.48L17.71 18.96L18.36 18.36L18.96 17.71L19.48 17L19.94 16.24L20.31 15.44L20.61 14.61L20.83 13.76L20.96 12.88L21 12L20.96 11.12ZM11.31 18.97L10.63 18.87L9.97 18.7L9.32 18.47L8.7 18.17L8.11 17.82L7.56 17.41L7.05 16.95L6.59 16.44L6.18 15.89L5.83 15.3L5.53 14.68L5.3 14.03L5.13 13.37L5.03 12.69L5 12L5.03 11.31L5.13 10.63L5.3 9.97L5.53 9.32L5.83 8.7L6.18 8.11L6.59 7.56L7.05 7.05L7.56 6.59L8.11 6.18L8.7 5.83L9.32 5.53L9.97 5.3L10.63 5.13L11.31 5.03L12 5L12 19Z"/>
+</svg>
diff --git a/assets/icons/procraft/rectangleshape.svg b/assets/icons/procraft/rectangleshape.svg
new file mode 100644
index 0000000..4890a99
--- /dev/null
+++ b/assets/icons/procraft/rectangleshape.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft rectangleshape icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M6.19 6.46L6.46 6.33L6.67 6.13L6.82 5.88L6.9 5.6L6.88 5.3L6.78 5.03L6.61 4.79L6.37 4.62L6.1 4.52L5.9 4.5L3.5 4.5L3.3 4.52L3.03 4.62L2.79 4.79L2.67 4.94L2.58 5.12L2.5 5.4L2.5 7.9L2.52 8.1L2.62 8.37L2.87 8.67L3.21 8.86L3.6 8.9L3.97 8.78L4.27 8.53L4.42 8.28L4.48 8.1L4.5 6.5L5.9 6.5ZM11.08 6.42L11.33 6.27L11.53 6.06L11.66 5.79L11.7 5.5L11.66 5.21L11.47 4.87L11.26 4.67L10.99 4.54L10.7 4.5L8.1 4.52L7.83 4.62L7.59 4.79L7.47 4.94L7.34 5.21L7.3 5.6L7.42 5.97L7.67 6.27L8.01 6.46L8.3 6.5L10.7 6.5ZM4.46 10.01L4.33 9.74L4.13 9.53L3.79 9.34L3.5 9.3L3.21 9.34L2.87 9.53L2.67 9.74L2.54 10.01L2.5 10.3L2.52 12.9L2.62 13.17L2.79 13.41L3.03 13.58L3.21 13.66L3.6 13.7L3.97 13.58L4.27 13.33L4.46 12.99L4.5 12.7L4.5 10.3ZM4.42 14.72L4.27 14.47L4.06 14.27L3.79 14.14L3.5 14.1L3.21 14.14L3.03 14.22L2.79 14.39L2.62 14.63L2.52 14.9L2.5 15.1L2.5 17.5L2.58 17.88L2.73 18.13L3.03 18.38L3.3 18.48L3.6 18.5L3.9 18.41L3.94 18.79L4.13 19.13L4.43 19.38L4.7 19.48L7.4 19.5L7.68 19.42L7.93 19.27L8.07 19.13L8.22 18.88L8.28 18.7L8.3 18.4L8.26 18.21L8.13 17.94L7.93 17.73L7.77 17.62L7.5 17.52L7.3 17.5L4.9 17.5L4.7 17.52L4.5 17.59L4.5 15.1ZM9.41 17.54L9.14 17.67L8.93 17.87L8.74 18.21L8.7 18.5L8.74 18.79L8.93 19.13L9.14 19.33L9.41 19.46L9.7 19.5L12.3 19.48L12.57 19.38L12.73 19.27L12.93 19.06L13.06 18.79L13.1 18.4L12.98 18.03L12.73 17.73L12.39 17.54L12.1 17.5L9.7 17.5ZM15.88 6.42L16.13 6.27L16.33 6.06L16.46 5.79L16.5 5.5L16.46 5.21L16.27 4.87L16.06 4.67L15.79 4.54L15.5 4.5L12.9 4.52L12.63 4.62L12.47 4.73L12.27 4.94L12.14 5.21L12.1 5.6L12.22 5.97L12.47 6.27L12.81 6.46L13.1 6.5L15.5 6.5ZM20.68 6.42L20.93 6.27L21.13 6.06L21.26 5.79L21.3 5.5L21.26 5.21L21.07 4.87L20.86 4.67L20.59 4.54L20.3 4.5L17.7 4.52L17.52 4.58L17.27 4.73L17.07 4.94L16.94 5.21L16.9 5.6L17.02 5.97L17.27 6.27L17.61 6.46L17.9 6.5L20.3 6.5ZM19.58 10.48L19.73 10.73L19.94 10.93L20.21 11.06L20.5 11.1L20.79 11.06L21.13 10.87L21.33 10.66L21.46 10.39L21.5 10.1L21.48 7.5L21.38 7.23L21.27 7.07L21.06 6.87L20.79 6.74L20.4 6.7L20.03 6.82L19.73 7.07L19.54 7.41L19.5 7.7L19.5 10.1ZM19.58 15.28L19.73 15.53L19.94 15.73L20.21 15.86L20.5 15.9L20.79 15.86L21.13 15.67L21.33 15.46L21.46 15.19L21.5 14.9L21.48 12.3L21.38 12.03L21.27 11.87L21.06 11.67L20.79 11.54L20.4 11.5L20.03 11.62L19.73 11.87L19.54 12.21L19.5 12.5L19.5 14.9ZM18.38 18.12L18.3 18.4L18.32 18.7L18.42 18.97L18.59 19.21L18.83 19.38L19.1 19.48L19.4 19.5L19.68 19.42L20.01 19.21L21.33 17.86L21.46 17.59L21.5 17.4L21.48 17.1L21.42 16.92L21.21 16.59L20.88 16.38L20.5 16.3L20.12 16.38L19.79 16.59L18.59 17.79ZM14.12 17.58L13.87 17.73L13.67 17.94L13.54 18.21L13.5 18.5L13.54 18.79L13.73 19.13L13.94 19.33L14.21 19.46L14.5 19.5L17.1 19.48L17.37 19.38L17.53 19.27L17.73 19.06L17.86 18.79L17.9 18.4L17.78 18.03L17.53 17.73L17.19 17.54L16.9 17.5L14.5 17.5Z"/>
+</svg>
diff --git a/assets/icons/procraft/saveload.svg b/assets/icons/procraft/saveload.svg
new file mode 100644
index 0000000..dd9d6c0
--- /dev/null
+++ b/assets/icons/procraft/saveload.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft saveload icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M13.2 3.5L13.18 3.27L13.11 3.04L12.93 2.74L12.67 2.5L12.46 2.39L12.23 2.32L12 2.3L11.77 2.32L11.43 2.44L11.24 2.57L11.07 2.74L10.94 2.93L10.85 3.15L10.8 3.5L10.8 11.4L7.86 11.41L7.72 11.47L7.61 11.58L7.54 11.79L7.57 11.95L7.65 12.08L11.71 16.3L11.84 16.39L12 16.42L12.16 16.39L12.29 16.3L16.35 12.08L16.45 11.87L16.45 11.72L16.39 11.58L16.28 11.47L16.14 11.41L13.2 11.4ZM2.82 20.23L2.89 20.46L3 20.67L3.24 20.93L3.54 21.11L3.88 21.19L20 21.2L20.23 21.18L20.46 21.11L20.76 20.93L21 20.67L21.15 20.35L21.19 20.12L21.2 12.5L21.18 12.27L21.11 12.04L20.93 11.74L20.67 11.5L20.35 11.35L20.12 11.31L19.88 11.31L19.54 11.39L19.24 11.57L19 11.83L18.85 12.15L18.8 12.5L18.8 18.8L5.2 18.8L5.2 12.5L5.18 12.27L5.11 12.04L4.93 11.74L4.76 11.57L4.57 11.44L4.35 11.35L4.12 11.31L3.88 11.31L3.54 11.39L3.24 11.57L3.07 11.74L2.89 12.04L2.81 12.38L2.8 20Z"/>
+</svg>
diff --git a/assets/icons/procraft/selectadd.svg b/assets/icons/procraft/selectadd.svg
new file mode 100644
index 0000000..8ca6ca2
--- /dev/null
+++ b/assets/icons/procraft/selectadd.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft selectadd icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M20.98 11.41L20.83 10.24L20.69 9.67L20.31 8.56L20.07 8.02L19.48 7L19.14 6.52L18.36 5.64L17.93 5.23L17 4.52L16.5 4.21L15.98 3.93L14.89 3.48L13.76 3.17L13.17 3.08L12 3L11.41 3.02L10.83 3.08L9.67 3.31L8.56 3.69L8.02 3.93L7 4.52L6.52 4.86L5.64 5.64L5.23 6.07L4.86 6.52L4.21 7.5L3.93 8.02L3.48 9.11L3.17 10.24L3.08 10.83L3 12L3.02 12.59L3.17 13.76L3.31 14.33L3.48 14.89L3.93 15.98L4.52 17L4.86 17.48L5.23 17.93L6.07 18.77L7 19.48L7.5 19.79L8.56 20.31L9.11 20.52L9.67 20.69L10.83 20.92L11.41 20.98L12.59 20.98L13.17 20.92L14.33 20.69L14.89 20.52L15.98 20.07L17 19.48L17.48 19.14L18.36 18.36L18.77 17.93L19.14 17.48L19.79 16.5L20.07 15.98L20.52 14.89L20.69 14.33L20.92 13.17L20.98 12.59ZM16.8 13.2L13.2 13.2L13.2 16.8L13.15 17.15L13 17.47L12.85 17.65L12.67 17.8L12.35 17.95L12.12 17.99L11.88 17.99L11.54 17.91L11.24 17.73L11.07 17.56L10.94 17.37L10.82 17.03L10.8 16.8L10.8 13.2L7.2 13.2L6.85 13.15L6.53 13L6.35 12.85L6.2 12.67L6.09 12.46L6.02 12.23L6.01 11.88L6.05 11.65L6.14 11.43L6.35 11.15L6.63 10.94L6.97 10.82L7.2 10.8L10.8 10.8L10.8 7.2L10.85 6.85L10.94 6.63L11.07 6.44L11.33 6.2L11.54 6.09L11.77 6.02L12.12 6.01L12.46 6.09L12.67 6.2L12.85 6.35L13.06 6.63L13.18 6.97L13.2 7.2L13.2 10.8L16.92 10.81L17.15 10.85L17.37 10.94L17.56 11.07L17.8 11.33L17.95 11.65L17.99 11.88L17.98 12.23L17.86 12.57L17.73 12.76L17.47 13L17.15 13.15Z"/>
+</svg>
diff --git a/assets/icons/procraft/selectcopypaste.svg b/assets/icons/procraft/selectcopypaste.svg
new file mode 100644
index 0000000..369aaf7
--- /dev/null
+++ b/assets/icons/procraft/selectcopypaste.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft selectcopypaste icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M15.16 4.39L14.91 4.09L14.61 3.84L14.27 3.65L13.89 3.54L13.5 3.5L5.5 3.5L5.11 3.54L4.73 3.65L4.39 3.84L4.09 4.09L3.84 4.39L3.65 4.73L3.54 5.11L3.5 5.5L3.5 13.5L3.54 13.89L3.65 14.27L3.84 14.61L4.09 14.91L4.39 15.16L4.73 15.35L5.11 15.46L5.5 15.5L7.3 15.5L7.3 13.5L5.7 13.5L5.59 13.47L5.5 13.34L5.5 5.7L5.56 5.56L5.7 5.5L13.34 5.5L13.47 5.59L13.5 5.7L13.5 7.3L15.5 7.3L15.5 5.5L15.46 5.11L15.35 4.73ZM20.46 10.11L20.35 9.73L20.16 9.39L19.91 9.09L19.61 8.84L19.27 8.65L18.89 8.54L18.5 8.5L10.5 8.5L10.11 8.54L9.73 8.65L9.39 8.84L9.09 9.09L8.84 9.39L8.65 9.73L8.54 10.11L8.5 10.5L8.5 18.5L8.54 18.89L8.65 19.27L8.84 19.61L9.09 19.91L9.39 20.16L9.73 20.35L10.11 20.46L10.5 20.5L18.5 20.5L18.89 20.46L19.27 20.35L19.61 20.16L19.91 19.91L20.16 19.61L20.35 19.27L20.46 18.89L20.5 18.5L20.5 10.5Z"/>
+</svg>
diff --git a/assets/icons/procraft/selectremove.svg b/assets/icons/procraft/selectremove.svg
new file mode 100644
index 0000000..5f92c2f
--- /dev/null
+++ b/assets/icons/procraft/selectremove.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <!-- ProCraft selectremove icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->
+ <path fill="currentColor" fill-rule="evenodd" d="M20.98 11.41L20.83 10.24L20.69 9.67L20.31 8.56L20.07 8.02L19.48 7L19.14 6.52L18.36 5.64L17.93 5.23L17 4.52L16.5 4.21L15.98 3.93L14.89 3.48L13.76 3.17L13.17 3.08L12 3L11.41 3.02L10.83 3.08L9.67 3.31L8.56 3.69L8.02 3.93L7 4.52L6.52 4.86L5.64 5.64L5.23 6.07L4.86 6.52L4.21 7.5L3.93 8.02L3.48 9.11L3.17 10.24L3.08 10.83L3 12L3.02 12.59L3.17 13.76L3.31 14.33L3.48 14.89L3.93 15.98L4.52 17L4.86 17.48L5.23 17.93L6.07 18.77L7 19.48L7.5 19.79L8.56 20.31L9.11 20.52L9.67 20.69L10.83 20.92L11.41 20.98L12.59 20.98L13.17 20.92L14.33 20.69L14.89 20.52L15.98 20.07L17 19.48L17.48 19.14L18.36 18.36L18.77 17.93L19.14 17.48L19.79 16.5L20.07 15.98L20.52 14.89L20.69 14.33L20.92 13.17L20.98 12.59ZM7.2 13.2L6.97 13.18L6.74 13.11L6.53 13L6.35 12.85L6.2 12.67L6.09 12.46L6.02 12.23L6 12L6.02 11.77L6.09 11.54L6.27 11.24L6.44 11.07L6.63 10.94L6.85 10.85L7.08 10.81L16.92 10.81L17.26 10.89L17.47 11L17.65 11.15L17.86 11.43L17.95 11.65L17.99 11.88L17.99 12.12L17.95 12.35L17.86 12.57L17.73 12.76L17.56 12.93L17.37 13.06L17.15 13.15L16.92 13.19Z"/>
+</svg>
diff --git a/tools/icons/draw_icons.py b/tools/icons/draw_icons.py
index 774d3f5..8d48eb7 100644
--- a/tools/icons/draw_icons.py
+++ b/tools/icons/draw_icons.py
@@ -191,12 +191,104 @@ def help_tab():
return unary_union([ring(12, 12, 9.0, 2.0), hook.buffer(1.15, join_style='round'), Point(12, 17.4).buffer(1.35, quad_segs=10)])
+def dashes(points, closed, dash, gap_len, r):
+ """Short capsules along a line through `points`: a dashed outline."""
+ line = LineString(points + ([points[0]] if closed else []))
+ out, t = [], 0.0
+ while t < line.length:
+ a, b = line.interpolate(t), line.interpolate(min(t + dash, line.length))
+ out.append(capsule((a.x, a.y), (b.x, b.y), r))
+ t += dash + gap_len
+ return unary_union(out)
+
+
+def lasso():
+ """Freehand: a lasso's loop with its tail."""
+ loop = rotate(Point(12.5, 9.5).buffer(1.0, quad_segs=24), 0)
+ from shapely.affinity import scale
+ ellipse = scale(Point(12.5, 9.5).buffer(1.0, quad_segs=24), 8.0, 5.2)
+ loop = rotate(ellipse.buffer(1.1).difference(ellipse.buffer(-1.1)), -12, origin=(12.5, 9.5))
+ tail = LineString([(7.6, 13.6), (7.0, 16.2), (8.6, 18.0), (6.6, 20.6)]).buffer(1.1, join_style='round')
+ return unary_union([loop, tail, Point(7.8, 13.8).buffer(1.6, quad_segs=10)])
+
+
+def rectangle_tool():
+ """Rectangle: a dashed rectangle."""
+ return dashes([(3.5, 5.5), (20.5, 5.5), (20.5, 18.5), (3.5, 18.5)], True, 2.4, 2.4, 1.0)
+
+
+def ellipse_tool():
+ """Ellipse: a dashed ellipse."""
+ pts = [(12 + 8.5 * math.cos(a / 48 * 2 * math.pi), 12 + 6.5 * math.sin(a / 48 * 2 * math.pi)) for a in range(48)]
+ return dashes(pts, True, 2.4, 2.4, 1.0)
+
+
+def sign_in_disc(minus):
+ """Add (or Subtract): a plus (a minus) cut out of a disc."""
+ disc = Point(12, 12).buffer(9.0, quad_segs=24)
+ mark = capsule((7.2, 12), (16.8, 12), 1.2)
+ if not minus:
+ mark = mark.union(capsule((12, 7.2), (12, 16.8), 1.2))
+ return disc.difference(mark)
+
+
+def invert():
+ """Invert: a disc, one half solid, the other its outline."""
+ outline = ring(12, 12, 8.0, 2.0)
+ half = Point(12, 12).buffer(8.0, quad_segs=24).intersection(box(12, 0, 24, 24))
+ return unary_union([outline, half])
+
+
+def copy_paste():
+ """Copy and paste: two sheets, the front one solid."""
+ back = frame(3.5, 3.5, 15.5, 15.5, 2.0, 2.0)
+ front = soft(box(8.5, 8.5, 20.5, 20.5), 2.0)
+ return unary_union([back.difference(box(7.3, 7.3, 21.7, 21.7)), front])
+
+
+def feather():
+ """Feather: a feather, its vane split by the shaft."""
+ vane = Polygon([(19.5, 4.5)] + [(19.5 - 12 * t + 3.2 * math.sin(t * math.pi) * SQ2, 4.5 + 12 * t + 3.2 * math.sin(t * math.pi) * SQ2)
+ for t in [i / 20 for i in range(1, 21)]]
+ + [(19.5 - 12 * t - 3.2 * math.sin(t * math.pi) * SQ2, 4.5 + 12 * t - 3.2 * math.sin(t * math.pi) * SQ2)
+ for t in [i / 20 for i in range(19, 0, -1)]])
+ shaft = LineString([(19.0, 5.0), (5.5, 18.5)])
+ vane = soft(vane, 0.3).difference(shaft.buffer(0.55))
+ return unary_union([vane, capsule((7.8, 16.2), (4.0, 20.0), 1.0)])
+
+
+def save_load():
+ """Save and load: a tray with an arrow coming down into it."""
+ tray = LineString([(4, 12.5), (4, 20), (20, 20), (20, 12.5)]).buffer(1.2, join_style='round')
+ shaft = capsule((12, 3.5), (12, 12), 1.2)
+ head = soft(Polygon([(12, 16.6), (7, 11.4), (17, 11.4)]), 0.4)
+ return unary_union([tray, shaft, head])
+
+
+def paint_bucket():
+ """Colour fill: a tipped bucket and a drop falling from it."""
+ bucket = soft(Polygon([(4.5, 9.5), (13.5, 3.8), (19.0, 12.5), (10.0, 18.2)]), 1.2)
+ rim = capsule((4.5, 9.5), (13.5, 3.8), 0.6)
+ bucket = bucket.difference(LineString([(6.6, 11.2), (14.6, 6.1)]).buffer(0.55))
+ drop = unary_union([Point(19.2, 18.6).buffer(2.1, quad_segs=12), Point(19.2, 14.4).buffer(0.2)]).convex_hull
+ return unary_union([bucket, rim, drop])
+
+
+def cross():
+ """Clear: a cross."""
+ return unary_union([capsule((5.5, 5.5), (18.5, 18.5), 1.3), capsule((18.5, 5.5), (5.5, 18.5), 1.3)])
+
+
DRAWINGS = {
'actions': wrench, 'adjustments': wand, 'selection': selection, 'transform': arrow,
'brush': paintbrush, 'smudge': fingertip, 'erase': eraser, 'layers': layers,
'undo': lambda: turning_arrow(False), 'redo': lambda: turning_arrow(True),
'tabadd': plus, 'tabcanvas': canvas_tab, 'tabshare': share_tab, 'tabvideo': video_tab,
'tabprefs': prefs_tab, 'tabhelp': help_tab,
+ 'automatic': wand, 'freehand': lasso, 'rectangleshape': rectangle_tool, 'ellipseshape': ellipse_tool,
+ 'selectadd': lambda: sign_in_disc(False), 'selectremove': lambda: sign_in_disc(True), 'invert': invert,
+ 'selectcopypaste': copy_paste, 'feather': feather, 'saveload': save_load, 'colorfill': paint_bucket,
+ 'clearselection': cross,
}