Compare commits
16 Commits
4e9eacc7b0
...
gui-testin
| Author | SHA1 | Date | |
|---|---|---|---|
| fa03714826 | |||
38d26f0028
|
|||
|
462c27e111
|
|||
|
e0fd726f02
|
|||
|
7f93084e64
|
|||
| 6e59cb86dc | |||
| 98a4f50031 | |||
|
0a19462b0f
|
|||
|
cfed4fd5ed
|
|||
|
eaf0c3cb55
|
|||
|
61669e15bd
|
|||
|
f2556f7125
|
|||
| 7494dc6b75 | |||
| 43afb9dfd3 | |||
| 6b5bbfbc54 | |||
|
b39419888b
|
495
Cargo.lock
generated
495
Cargo.lock
generated
@ -28,6 +28,22 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "accesskit"
|
||||||
|
version = "0.19.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e25ae84c0260bdf5df07796d7cc4882460de26a2b406ec0e6c42461a723b271b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "accesskit_consumer"
|
||||||
|
version = "0.28.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8bfae7c152994a31dc7d99b8eeac7784a919f71d1b306f4b83217e110fd3824c"
|
||||||
|
dependencies = [
|
||||||
|
"accesskit 0.19.0",
|
||||||
|
"hashbrown",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "adler2"
|
name = "adler2"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
@ -143,6 +159,12 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anyhow"
|
||||||
|
version = "1.0.98"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arboard"
|
name = "arboard"
|
||||||
version = "3.5.0"
|
version = "3.5.0"
|
||||||
@ -163,6 +185,12 @@ dependencies = [
|
|||||||
"x11rb",
|
"x11rb",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "arrayref"
|
||||||
|
version = "0.3.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arrayvec"
|
name = "arrayvec"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@ -406,7 +434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"termcolor",
|
"termcolor",
|
||||||
"unicode-width",
|
"unicode-width 0.1.14",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -415,6 +443,16 @@ version = "1.0.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
|
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "colored"
|
||||||
|
version = "2.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
"windows-sys 0.59.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "combine"
|
name = "combine"
|
||||||
version = "4.6.7"
|
version = "4.6.7"
|
||||||
@ -505,6 +543,25 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-deque"
|
||||||
|
version = "0.8.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-epoch",
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-epoch"
|
||||||
|
version = "0.9.18"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-utils"
|
name = "crossbeam-utils"
|
||||||
version = "0.8.21"
|
version = "0.8.21"
|
||||||
@ -523,6 +580,25 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
|
checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "data-url"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dify"
|
||||||
|
version = "0.7.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "11217d469eafa3b809ad84651eb9797ccbb440b4a916d5d85cb1b994e89787f6"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"colored",
|
||||||
|
"getopts",
|
||||||
|
"image",
|
||||||
|
"rayon",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dispatch"
|
name = "dispatch"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@ -626,6 +702,7 @@ dependencies = [
|
|||||||
"objc2-foundation 0.2.2",
|
"objc2-foundation 0.2.2",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
|
"pollster",
|
||||||
"profiling",
|
"profiling",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"ron",
|
"ron",
|
||||||
@ -635,6 +712,7 @@ dependencies = [
|
|||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
"web-sys",
|
"web-sys",
|
||||||
"web-time",
|
"web-time",
|
||||||
|
"wgpu",
|
||||||
"winapi",
|
"winapi",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
"winit",
|
"winit",
|
||||||
@ -645,7 +723,7 @@ name = "egui"
|
|||||||
version = "0.31.1"
|
version = "0.31.1"
|
||||||
source = "git+https://github.com/emilk/egui?rev=f2ce6424f3a32f47308fb9871d540c01377b2cd9#f2ce6424f3a32f47308fb9871d540c01377b2cd9"
|
source = "git+https://github.com/emilk/egui?rev=f2ce6424f3a32f47308fb9871d540c01377b2cd9#f2ce6424f3a32f47308fb9871d540c01377b2cd9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit 0.18.0",
|
||||||
"ahash",
|
"ahash",
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"emath",
|
"emath",
|
||||||
@ -696,6 +774,21 @@ dependencies = [
|
|||||||
"winit",
|
"winit",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "egui_extras"
|
||||||
|
version = "0.31.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "624659a2e972a46f4d5f646557906c55f1cd5a0836eddbe610fdf1afba1b4226"
|
||||||
|
dependencies = [
|
||||||
|
"ahash",
|
||||||
|
"egui",
|
||||||
|
"enum-map",
|
||||||
|
"log",
|
||||||
|
"mime_guess2",
|
||||||
|
"profiling",
|
||||||
|
"resvg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "egui_glow"
|
name = "egui_glow"
|
||||||
version = "0.31.1"
|
version = "0.31.1"
|
||||||
@ -730,6 +823,27 @@ dependencies = [
|
|||||||
"winit",
|
"winit",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "egui_kittest"
|
||||||
|
version = "0.31.1"
|
||||||
|
source = "git+https://github.com/emilk/egui?rev=f2ce6424f3a32f47308fb9871d540c01377b2cd9#f2ce6424f3a32f47308fb9871d540c01377b2cd9"
|
||||||
|
dependencies = [
|
||||||
|
"dify",
|
||||||
|
"eframe",
|
||||||
|
"egui",
|
||||||
|
"egui-wgpu",
|
||||||
|
"image",
|
||||||
|
"kittest",
|
||||||
|
"pollster",
|
||||||
|
"wgpu",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "either"
|
||||||
|
version = "1.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "emath"
|
name = "emath"
|
||||||
version = "0.31.1"
|
version = "0.31.1"
|
||||||
@ -745,6 +859,27 @@ version = "1.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "enum-map"
|
||||||
|
version = "2.7.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
|
||||||
|
dependencies = [
|
||||||
|
"enum-map-derive",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "enum-map-derive"
|
||||||
|
version = "0.17.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "enumn"
|
name = "enumn"
|
||||||
version = "0.1.14"
|
version = "0.1.14"
|
||||||
@ -853,6 +988,12 @@ dependencies = [
|
|||||||
"miniz_oxide",
|
"miniz_oxide",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "float-cmp"
|
||||||
|
version = "0.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "foldhash"
|
name = "foldhash"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@ -935,6 +1076,15 @@ dependencies = [
|
|||||||
"windows-targets 0.48.5",
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "getopts"
|
||||||
|
version = "0.2.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-width 0.2.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "getrandom"
|
name = "getrandom"
|
||||||
version = "0.2.16"
|
version = "0.2.16"
|
||||||
@ -1090,6 +1240,18 @@ dependencies = [
|
|||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gpu-allocator"
|
||||||
|
version = "0.27.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
"presser",
|
||||||
|
"thiserror 1.0.69",
|
||||||
|
"windows",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpu-descriptor"
|
name = "gpu-descriptor"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
@ -1326,6 +1488,12 @@ dependencies = [
|
|||||||
"tiff",
|
"tiff",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "imagesize"
|
||||||
|
version = "0.12.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indenter"
|
name = "indenter"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
@ -1349,14 +1517,16 @@ dependencies = [
|
|||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"eframe",
|
"eframe",
|
||||||
"egui",
|
"egui",
|
||||||
|
"egui_extras",
|
||||||
"egui_glow 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"egui_glow 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"egui_kittest",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"eyre",
|
"eyre",
|
||||||
"getrandom 0.3.2",
|
"getrandom 0.3.2",
|
||||||
"half",
|
"half",
|
||||||
"insta",
|
"insta",
|
||||||
"log",
|
"log",
|
||||||
"rand",
|
"rand 0.9.1",
|
||||||
"rfd",
|
"rfd",
|
||||||
"serde",
|
"serde",
|
||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
@ -1471,6 +1641,31 @@ version = "3.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "kittest"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/rerun-io/kittest?branch=main#91bf0fd98b5afe04427bb3aea4c68c6e0034b4bd"
|
||||||
|
dependencies = [
|
||||||
|
"accesskit 0.19.0",
|
||||||
|
"accesskit_consumer",
|
||||||
|
"parking_lot",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "kurbo"
|
||||||
|
version = "0.9.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
|
||||||
|
dependencies = [
|
||||||
|
"arrayvec",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lazy_static"
|
||||||
|
version = "1.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.172"
|
version = "0.2.172"
|
||||||
@ -1580,6 +1775,24 @@ dependencies = [
|
|||||||
"paste",
|
"paste",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mime"
|
||||||
|
version = "0.3.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mime_guess2"
|
||||||
|
version = "2.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1706dc14a2e140dec0a7a07109d9a3d5890b81e85bd6c60b906b249a77adf0ca"
|
||||||
|
dependencies = [
|
||||||
|
"mime",
|
||||||
|
"phf",
|
||||||
|
"phf_shared",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.8.8"
|
version = "0.8.8"
|
||||||
@ -2047,6 +2260,56 @@ version = "2.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
|
||||||
|
dependencies = [
|
||||||
|
"phf_macros",
|
||||||
|
"phf_shared",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_generator"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
|
||||||
|
dependencies = [
|
||||||
|
"phf_shared",
|
||||||
|
"rand 0.8.5",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_macros"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
|
||||||
|
dependencies = [
|
||||||
|
"phf_generator",
|
||||||
|
"phf_shared",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_shared"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
|
||||||
|
dependencies = [
|
||||||
|
"siphasher 1.0.1",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pico-args"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-project"
|
name = "pin-project"
|
||||||
version = "1.1.10"
|
version = "1.1.10"
|
||||||
@ -2107,6 +2370,12 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pollster"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portable-atomic"
|
name = "portable-atomic"
|
||||||
version = "1.11.0"
|
version = "1.11.0"
|
||||||
@ -2131,6 +2400,12 @@ dependencies = [
|
|||||||
"zerocopy 0.8.25",
|
"zerocopy 0.8.25",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "presser"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-crate"
|
name = "proc-macro-crate"
|
||||||
version = "3.3.0"
|
version = "3.3.0"
|
||||||
@ -2179,6 +2454,15 @@ version = "5.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
|
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.8.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.6.4",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.9.1"
|
version = "0.9.1"
|
||||||
@ -2186,7 +2470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rand_chacha",
|
"rand_chacha",
|
||||||
"rand_core",
|
"rand_core 0.9.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2196,9 +2480,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ppv-lite86",
|
"ppv-lite86",
|
||||||
"rand_core",
|
"rand_core 0.9.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.6.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand_core"
|
name = "rand_core"
|
||||||
version = "0.9.3"
|
version = "0.9.3"
|
||||||
@ -2208,12 +2498,44 @@ dependencies = [
|
|||||||
"getrandom 0.3.2",
|
"getrandom 0.3.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "range-alloc"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "raw-window-handle"
|
name = "raw-window-handle"
|
||||||
version = "0.6.2"
|
version = "0.6.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rayon"
|
||||||
|
version = "1.10.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
|
||||||
|
dependencies = [
|
||||||
|
"either",
|
||||||
|
"rayon-core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rayon-core"
|
||||||
|
version = "1.12.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-deque",
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rctree"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
@ -2267,6 +2589,20 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "resvg"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
"pico-args",
|
||||||
|
"rgb",
|
||||||
|
"svgtypes",
|
||||||
|
"tiny-skia",
|
||||||
|
"usvg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rfd"
|
name = "rfd"
|
||||||
version = "0.15.3"
|
version = "0.15.3"
|
||||||
@ -2291,6 +2627,15 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rgb"
|
||||||
|
version = "0.8.50"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
|
||||||
|
dependencies = [
|
||||||
|
"bytemuck",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ron"
|
name = "ron"
|
||||||
version = "0.8.1"
|
version = "0.8.1"
|
||||||
@ -2303,6 +2648,12 @@ dependencies = [
|
|||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "roxmltree"
|
||||||
|
version = "0.19.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc-hash"
|
name = "rustc-hash"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@ -2396,6 +2747,27 @@ version = "2.7.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
|
checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "simplecss"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "siphasher"
|
||||||
|
version = "0.3.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "siphasher"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "slab"
|
name = "slab"
|
||||||
version = "0.4.9"
|
version = "0.4.9"
|
||||||
@ -2486,6 +2858,15 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strict-num"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
|
||||||
|
dependencies = [
|
||||||
|
"float-cmp",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strum"
|
name = "strum"
|
||||||
version = "0.26.3"
|
version = "0.26.3"
|
||||||
@ -2508,6 +2889,16 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "svgtypes"
|
||||||
|
version = "0.13.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
|
||||||
|
dependencies = [
|
||||||
|
"kurbo",
|
||||||
|
"siphasher 0.3.11",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "2.0.100"
|
version = "2.0.100"
|
||||||
@ -2609,6 +3000,32 @@ dependencies = [
|
|||||||
"weezl",
|
"weezl",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[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",
|
||||||
|
"png",
|
||||||
|
"tiny-skia-path",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[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]]
|
[[package]]
|
||||||
name = "tinystr"
|
name = "tinystr"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@ -2684,6 +3101,12 @@ dependencies = [
|
|||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicase"
|
||||||
|
version = "2.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.18"
|
version = "1.0.18"
|
||||||
@ -2702,6 +3125,12 @@ version = "0.1.14"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-width"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-xid"
|
name = "unicode-xid"
|
||||||
version = "0.2.6"
|
version = "0.2.6"
|
||||||
@ -2719,6 +3148,50 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usvg"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756"
|
||||||
|
dependencies = [
|
||||||
|
"base64 0.21.7",
|
||||||
|
"log",
|
||||||
|
"pico-args",
|
||||||
|
"usvg-parser",
|
||||||
|
"usvg-tree",
|
||||||
|
"xmlwriter",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usvg-parser"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
|
||||||
|
dependencies = [
|
||||||
|
"data-url",
|
||||||
|
"flate2",
|
||||||
|
"imagesize",
|
||||||
|
"kurbo",
|
||||||
|
"log",
|
||||||
|
"roxmltree",
|
||||||
|
"simplecss",
|
||||||
|
"siphasher 0.3.11",
|
||||||
|
"svgtypes",
|
||||||
|
"usvg-tree",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usvg-tree"
|
||||||
|
version = "0.37.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
|
||||||
|
dependencies = [
|
||||||
|
"rctree",
|
||||||
|
"strict-num",
|
||||||
|
"svgtypes",
|
||||||
|
"tiny-skia-path",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "utf16_iter"
|
name = "utf16_iter"
|
||||||
version = "1.0.5"
|
version = "1.0.5"
|
||||||
@ -3009,6 +3482,7 @@ dependencies = [
|
|||||||
"document-features",
|
"document-features",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"log",
|
"log",
|
||||||
|
"naga",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"profiling",
|
"profiling",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@ -3056,13 +3530,16 @@ dependencies = [
|
|||||||
"android_system_properties",
|
"android_system_properties",
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"ash",
|
"ash",
|
||||||
|
"bit-set",
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
|
"block",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
"core-graphics-types",
|
"core-graphics-types",
|
||||||
"glow",
|
"glow",
|
||||||
"glutin_wgl_sys",
|
"glutin_wgl_sys",
|
||||||
"gpu-alloc",
|
"gpu-alloc",
|
||||||
|
"gpu-allocator",
|
||||||
"gpu-descriptor",
|
"gpu-descriptor",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"khronos-egl",
|
"khronos-egl",
|
||||||
@ -3077,6 +3554,7 @@ dependencies = [
|
|||||||
"ordered-float",
|
"ordered-float",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"profiling",
|
"profiling",
|
||||||
|
"range-alloc",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"renderdoc-sys",
|
"renderdoc-sys",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
@ -3086,6 +3564,7 @@ dependencies = [
|
|||||||
"web-sys",
|
"web-sys",
|
||||||
"wgpu-types",
|
"wgpu-types",
|
||||||
"windows",
|
"windows",
|
||||||
|
"windows-core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3525,6 +4004,12 @@ version = "0.8.26"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
|
checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "xmlwriter"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yoke"
|
name = "yoke"
|
||||||
version = "0.7.5"
|
version = "0.7.5"
|
||||||
|
|||||||
@ -13,6 +13,7 @@ pinenote = []
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
egui = "0.31"
|
egui = "0.31"
|
||||||
|
egui_extras = { version = "0.31", features = ["svg"] }
|
||||||
eframe = { version = "0.31", default-features = false, features = [
|
eframe = { version = "0.31", default-features = false, features = [
|
||||||
"glow", # alt: "wgpu".
|
"glow", # alt: "wgpu".
|
||||||
"persistence",
|
"persistence",
|
||||||
@ -40,9 +41,11 @@ web-sys = "0.3.77"
|
|||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
egui = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
egui = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
||||||
eframe = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
eframe = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
||||||
|
egui_kittest = { git = "https://github.com/emilk/egui", rev = "f2ce6424f3a32f47308fb9871d540c01377b2cd9" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
insta = { version = "1.43.1", features = ["yaml"] }
|
insta = { version = "1.43.1", features = ["yaml"] }
|
||||||
|
egui_kittest = { version = "0.31", features = ["wgpu", "snapshot"] }
|
||||||
# egui = { path = "../egui/crates/egui" }
|
# egui = { path = "../egui/crates/egui" }
|
||||||
# eframe = { path = "../egui/crates/eframe" }
|
# eframe = { path = "../egui/crates/eframe" }
|
||||||
|
|
||||||
|
|||||||
73
assets/collapse-icon.svg
Normal file
73
assets/collapse-icon.svg
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="256"
|
||||||
|
height="256"
|
||||||
|
viewBox="0 0 67.733332 67.733332"
|
||||||
|
version="1.1"
|
||||||
|
id="svg1"
|
||||||
|
inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
|
||||||
|
sodipodi:docname="collapse-icon.svg"
|
||||||
|
inkscape:export-filename="collapse-icon.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg">
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="namedview1"
|
||||||
|
pagecolor="#505050"
|
||||||
|
bordercolor="#eeeeee"
|
||||||
|
borderopacity="1"
|
||||||
|
inkscape:showpageshadow="0"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pagecheckerboard="0"
|
||||||
|
inkscape:deskcolor="#505050"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:zoom="2.0010679"
|
||||||
|
inkscape:cx="97.198102"
|
||||||
|
inkscape:cy="140.42502"
|
||||||
|
inkscape:window-width="1472"
|
||||||
|
inkscape:window-height="815"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="38"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="layer1" />
|
||||||
|
<defs
|
||||||
|
id="defs1" />
|
||||||
|
<g
|
||||||
|
inkscape:label="Lager 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1">
|
||||||
|
<rect
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:4.92907;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
id="rect1"
|
||||||
|
width="62.804268"
|
||||||
|
height="52.220932"
|
||||||
|
x="2.4645352"
|
||||||
|
y="7.7562032"
|
||||||
|
ry="6.9627905" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:4.92628;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 28.921473,6.35 V 61.383333"
|
||||||
|
id="path1" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250504,15.411171 9.4994923,15.320325"
|
||||||
|
id="path1-7" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250506,21.743139 9.4994938,21.652293"
|
||||||
|
id="path1-7-4" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250506,28.075107 9.4994938,27.984261"
|
||||||
|
id="path1-7-5" />
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:3.12398;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 22.250508,34.407075 9.4994958,34.316229"
|
||||||
|
id="path1-7-4-4" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.8 KiB |
100
src/app.rs
100
src/app.rs
@ -6,10 +6,10 @@ use std::{
|
|||||||
time::{Duration, Instant},
|
time::{Duration, Instant},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{file_editor::FileEditor, preferences::Preferences, util::GuiSender};
|
use crate::{file_editor::FileEditor, folder::Folder, preferences::Preferences, util::GuiSender};
|
||||||
use egui::{
|
use egui::{
|
||||||
Align, Button, Color32, Context, FontData, FontDefinitions, Key, Modifiers, PointerButton,
|
Align, Button, Context, FontData, FontDefinitions, Image, Key, Modifiers, PointerButton,
|
||||||
RichText, ScrollArea, Stroke,
|
RichText, ScrollArea, Widget, include_image,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
@ -25,6 +25,10 @@ pub struct App {
|
|||||||
jobs: Jobs,
|
jobs: Jobs,
|
||||||
|
|
||||||
tabs: Vec<(TabId, Tab)>,
|
tabs: Vec<(TabId, Tab)>,
|
||||||
|
|
||||||
|
show_folders: bool,
|
||||||
|
folders: Vec<Folder>,
|
||||||
|
|
||||||
open_tab_index: Option<usize>,
|
open_tab_index: Option<usize>,
|
||||||
|
|
||||||
next_tab_id: TabId,
|
next_tab_id: TabId,
|
||||||
@ -80,6 +84,7 @@ pub type TabId = usize;
|
|||||||
|
|
||||||
pub enum Action {
|
pub enum Action {
|
||||||
OpenFile(FileEditor),
|
OpenFile(FileEditor),
|
||||||
|
OpenFolder(Folder),
|
||||||
MoveFile(TabId, PathBuf),
|
MoveFile(TabId, PathBuf),
|
||||||
CloseTab(TabId),
|
CloseTab(TabId),
|
||||||
// TODO
|
// TODO
|
||||||
@ -102,6 +107,8 @@ impl Default for App {
|
|||||||
tabs: vec![(1, Tab::File(FileEditor::new("note.md")))],
|
tabs: vec![(1, Tab::File(FileEditor::new("note.md")))],
|
||||||
open_tab_index: None,
|
open_tab_index: None,
|
||||||
next_tab_id: 2,
|
next_tab_id: 2,
|
||||||
|
show_folders: false,
|
||||||
|
folders: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -175,11 +182,8 @@ impl App {
|
|||||||
|
|
||||||
cc.egui_ctx.set_fonts(fonts);
|
cc.egui_ctx.set_fonts(fonts);
|
||||||
|
|
||||||
cc.egui_ctx.style_mut(|style| {
|
// enable features on egui_extras to add more image types
|
||||||
// TODO: change color of text in TextEdit
|
egui_extras::install_image_loaders(&cc.egui_ctx);
|
||||||
style.visuals.widgets.noninteractive.fg_stroke =
|
|
||||||
Stroke::new(1.0, Color32::from_rgb(200, 200, 200));
|
|
||||||
});
|
|
||||||
|
|
||||||
if let Some(storage) = cc.storage {
|
if let Some(storage) = cc.storage {
|
||||||
return eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default();
|
return eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default();
|
||||||
@ -194,6 +198,18 @@ impl App {
|
|||||||
|
|
||||||
fn handle_action(&mut self, action: Action) {
|
fn handle_action(&mut self, action: Action) {
|
||||||
match action {
|
match action {
|
||||||
|
Action::OpenFolder(new_folder) => {
|
||||||
|
if let Some(folder) = self
|
||||||
|
.folders
|
||||||
|
.iter_mut()
|
||||||
|
.find(|folder| folder.path() == new_folder.path())
|
||||||
|
{
|
||||||
|
*folder = new_folder;
|
||||||
|
} else {
|
||||||
|
self.folders.push(new_folder);
|
||||||
|
self.folders.sort_by(|a, b| a.name().cmp(b.name()));
|
||||||
|
}
|
||||||
|
}
|
||||||
Action::OpenFile(file_editor) => {
|
Action::OpenFile(file_editor) => {
|
||||||
self.open_tab(Tab::File(file_editor));
|
self.open_tab(Tab::File(file_editor));
|
||||||
}
|
}
|
||||||
@ -262,7 +278,12 @@ impl eframe::App for App {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ui.button("Open Folder").clicked() {
|
if ui.button("Open Folder").clicked() {
|
||||||
log::error!("Open Folder not implemented");
|
self.jobs.start(ui.ctx(), move || {
|
||||||
|
let path = rfd::FileDialog::new().pick_folder()?;
|
||||||
|
let name = path.file_name()?.to_string_lossy().to_string();
|
||||||
|
let folder = Folder::NotLoaded { name, path };
|
||||||
|
Some(Action::OpenFolder(folder))
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if ui
|
if ui
|
||||||
@ -277,8 +298,8 @@ impl eframe::App for App {
|
|||||||
let can_save_file = self
|
let can_save_file = self
|
||||||
.open_tab_index
|
.open_tab_index
|
||||||
.and_then(|i| self.tabs.get(i))
|
.and_then(|i| self.tabs.get(i))
|
||||||
.and_then(|(id, tab)| match tab {
|
.map(|(id, tab)| match tab {
|
||||||
Tab::File(file_editor) => Some((*id, file_editor)),
|
Tab::File(file_editor) => (*id, file_editor),
|
||||||
})
|
})
|
||||||
.and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor)))
|
.and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor)))
|
||||||
.is_some();
|
.is_some();
|
||||||
@ -287,12 +308,11 @@ impl eframe::App for App {
|
|||||||
self.save_active_tab(ui.ctx());
|
self.save_active_tab(ui.ctx());
|
||||||
}
|
}
|
||||||
|
|
||||||
let open_file =
|
let open_file = self.open_tab_index.and_then(|i| self.tabs.get(i)).map(
|
||||||
self.open_tab_index
|
|(id, tab)| match tab {
|
||||||
.and_then(|i| self.tabs.get(i))
|
Tab::File(file_editor) => (*id, file_editor),
|
||||||
.and_then(|(id, tab)| match tab {
|
},
|
||||||
Tab::File(file_editor) => Some((*id, file_editor)),
|
);
|
||||||
});
|
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
if ui
|
if ui
|
||||||
@ -324,7 +344,16 @@ impl eframe::App for App {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ui.add_space(8.0);
|
||||||
|
|
||||||
|
let image = Image::new(include_image!("../assets/collapse-icon.svg"));
|
||||||
|
let image = image.tint(ui.style().visuals.text_color());
|
||||||
|
if Button::image(image).ui(ui).clicked() {
|
||||||
|
self.show_folders = !self.show_folders;
|
||||||
|
}
|
||||||
|
|
||||||
if !self.jobs.handles.is_empty() {
|
if !self.jobs.handles.is_empty() {
|
||||||
|
ui.add_space(8.0);
|
||||||
ui.spinner();
|
ui.spinner();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -351,6 +380,39 @@ impl eframe::App for App {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
egui::SidePanel::left("file browser")
|
||||||
|
.resizable(true)
|
||||||
|
.show_animated(ctx, self.show_folders, |ui| {
|
||||||
|
if ui.button("refresh").clicked() {
|
||||||
|
for folder in &mut self.folders {
|
||||||
|
folder.unload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollArea::both().auto_shrink(false).show(ui, |ui| {
|
||||||
|
self.folders.retain_mut(|folder| {
|
||||||
|
let response = folder.show(ui);
|
||||||
|
|
||||||
|
if let Some(file_path) = response.open_file {
|
||||||
|
let file_path = file_path.to_owned();
|
||||||
|
self.jobs.start(ui.ctx(), move || {
|
||||||
|
let text = fs::read_to_string(&file_path)
|
||||||
|
.inspect_err(|e| {
|
||||||
|
log::error!("Failed to read {file_path:?}: {e}")
|
||||||
|
})
|
||||||
|
.ok()?;
|
||||||
|
|
||||||
|
let editor = FileEditor::from_file(file_path, &text);
|
||||||
|
Some(Action::OpenFile(editor))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// delete on right-click
|
||||||
|
!response.clicked_by(PointerButton::Secondary)
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
egui::CentralPanel::default().show(ctx, |ui| {
|
egui::CentralPanel::default().show(ctx, |ui| {
|
||||||
if let Some(Tab::File(file_editor)) = self
|
if let Some(Tab::File(file_editor)) = self
|
||||||
.open_tab_index
|
.open_tab_index
|
||||||
@ -389,8 +451,8 @@ impl App {
|
|||||||
let open_file = self
|
let open_file = self
|
||||||
.open_tab_index
|
.open_tab_index
|
||||||
.and_then(|i| self.tabs.get_mut(i))
|
.and_then(|i| self.tabs.get_mut(i))
|
||||||
.and_then(|(id, tab)| match tab {
|
.map(|(id, tab)| match tab {
|
||||||
Tab::File(file_editor) => Some((*id, file_editor)),
|
Tab::File(file_editor) => (*id, file_editor),
|
||||||
})
|
})
|
||||||
.and_then(|(_, file_editor)| {
|
.and_then(|(_, file_editor)| {
|
||||||
file_editor
|
file_editor
|
||||||
|
|||||||
@ -1,243 +0,0 @@
|
|||||||
use egui::text::{CCursorRange, LayoutJob};
|
|
||||||
|
|
||||||
use crate::easy_mark::easy_mark_parser;
|
|
||||||
|
|
||||||
/// Highlight easymark, memoizing previous output to save CPU.
|
|
||||||
///
|
|
||||||
/// In practice, the highlighter is fast enough not to need any caching.
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct MemoizedHighlighter {
|
|
||||||
style: egui::Style,
|
|
||||||
code: String,
|
|
||||||
output: LayoutJob,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MemoizedHighlighter {
|
|
||||||
pub fn highlight(
|
|
||||||
&mut self,
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
code: &str,
|
|
||||||
cursor: Option<CCursorRange>,
|
|
||||||
) -> LayoutJob {
|
|
||||||
if (&self.style, self.code.as_str()) != (egui_style, code) {
|
|
||||||
self.style = egui_style.clone();
|
|
||||||
code.clone_into(&mut self.code);
|
|
||||||
self.output = highlight_easymark(egui_style, code, cursor);
|
|
||||||
}
|
|
||||||
self.output.clone()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn highlight_easymark(
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
mut text: &str,
|
|
||||||
|
|
||||||
// TODO: hide special characters where cursor isn't
|
|
||||||
_cursor: Option<CCursorRange>,
|
|
||||||
) -> LayoutJob {
|
|
||||||
let mut job = LayoutJob::default();
|
|
||||||
let mut style = easy_mark_parser::Style::default();
|
|
||||||
let mut start_of_line = true;
|
|
||||||
|
|
||||||
const CODE_INDENT: f32 = 10.0;
|
|
||||||
|
|
||||||
while !text.is_empty() {
|
|
||||||
if start_of_line && text.starts_with("```") {
|
|
||||||
let astyle = format_from_style(
|
|
||||||
egui_style,
|
|
||||||
&easy_mark_parser::Style {
|
|
||||||
code: true,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// Render the initial backticks as spaces
|
|
||||||
text = &text[3..];
|
|
||||||
job.append(" ", CODE_INDENT, astyle.clone());
|
|
||||||
|
|
||||||
match text.find("\n```") {
|
|
||||||
Some(n) => {
|
|
||||||
for line in text[..n + 1].lines() {
|
|
||||||
job.append(line, CODE_INDENT, astyle.clone());
|
|
||||||
job.append("\n", 0.0, astyle.clone());
|
|
||||||
}
|
|
||||||
// Render the final backticks as spaces
|
|
||||||
job.append(" ", CODE_INDENT, astyle);
|
|
||||||
text = &text[n + 4..];
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
job.append(text, 0.0, astyle.clone());
|
|
||||||
text = "";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
style = Default::default();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if text.starts_with('`') {
|
|
||||||
style.code = true;
|
|
||||||
let end = text[1..]
|
|
||||||
.find(&['`', '\n'][..])
|
|
||||||
.map_or_else(|| text.len(), |i| i + 2);
|
|
||||||
job.append(&text[..end], 0.0, format_from_style(egui_style, &style));
|
|
||||||
text = &text[end..];
|
|
||||||
style.code = false;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
let skip;
|
|
||||||
|
|
||||||
// zero-width space
|
|
||||||
let _zws = "\u{200b}";
|
|
||||||
|
|
||||||
let mut apply_basic_style =
|
|
||||||
|text: &mut &str,
|
|
||||||
style: &mut easy_mark_parser::Style,
|
|
||||||
access: fn(&mut easy_mark_parser::Style) -> &mut bool| {
|
|
||||||
let skip = if *access(style) {
|
|
||||||
// Include the character that is ending this style:
|
|
||||||
job.append(&text[..1], 0.0, format_from_style(egui_style, style));
|
|
||||||
*text = &text[1..];
|
|
||||||
0
|
|
||||||
} else {
|
|
||||||
1
|
|
||||||
};
|
|
||||||
*access(style) ^= true;
|
|
||||||
skip
|
|
||||||
};
|
|
||||||
|
|
||||||
if text.starts_with('*') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.strong);
|
|
||||||
} else if text.starts_with('/') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.italics);
|
|
||||||
} else if text.starts_with('_') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.underline);
|
|
||||||
} else if text.starts_with('$') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.small);
|
|
||||||
} else if text.starts_with('~') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.strikethrough);
|
|
||||||
} else if text.starts_with('^') {
|
|
||||||
skip = apply_basic_style(&mut text, &mut style, |style| &mut style.raised);
|
|
||||||
} else if text.starts_with('\\') && text.len() >= 2 {
|
|
||||||
skip = 2;
|
|
||||||
} else if start_of_line && text.starts_with(' ') {
|
|
||||||
// we don't preview indentation, because it is confusing
|
|
||||||
skip = 1;
|
|
||||||
} else if start_of_line && text.starts_with("###### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 7;
|
|
||||||
} else if start_of_line && text.starts_with("##### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 6;
|
|
||||||
} else if start_of_line && text.starts_with("#### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 5;
|
|
||||||
} else if start_of_line && text.starts_with("### ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 4;
|
|
||||||
} else if start_of_line && text.starts_with("## ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 3;
|
|
||||||
} else if start_of_line && text.starts_with("# ") {
|
|
||||||
style.heading = true;
|
|
||||||
skip = 2;
|
|
||||||
} else if start_of_line && text.starts_with("> ") {
|
|
||||||
style.quoted = true;
|
|
||||||
skip = 2;
|
|
||||||
// we don't preview indentation, because it is confusing
|
|
||||||
} else if start_of_line && text.trim_start().starts_with("- ") {
|
|
||||||
job.append("• ", 0.0, format_from_style(egui_style, &style));
|
|
||||||
text = &text[2..];
|
|
||||||
skip = 0;
|
|
||||||
// we don't preview indentation, because it is confusing
|
|
||||||
} else {
|
|
||||||
skip = 0;
|
|
||||||
}
|
|
||||||
// Note: we don't preview underline, strikethrough and italics because it confuses things.
|
|
||||||
|
|
||||||
// Swallow everything up to the next special character:
|
|
||||||
let line_end = text[skip..]
|
|
||||||
.find('\n')
|
|
||||||
.map_or_else(|| text.len(), |i| (skip + i + 1));
|
|
||||||
let end = text[skip..]
|
|
||||||
.find(&['*', '`', '~', '_', '/', '$', '^', '\\', '<', '['][..])
|
|
||||||
.map_or_else(|| text.len(), |i| (skip + i).max(1));
|
|
||||||
|
|
||||||
if line_end <= end {
|
|
||||||
job.append(
|
|
||||||
&text[..line_end],
|
|
||||||
0.0,
|
|
||||||
format_from_style(egui_style, &style),
|
|
||||||
);
|
|
||||||
text = &text[line_end..];
|
|
||||||
start_of_line = true;
|
|
||||||
style = Default::default();
|
|
||||||
} else {
|
|
||||||
job.append(&text[..end], 0.0, format_from_style(egui_style, &style));
|
|
||||||
text = &text[end..];
|
|
||||||
start_of_line = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
job
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_from_style(
|
|
||||||
egui_style: &egui::Style,
|
|
||||||
emark_style: &easy_mark_parser::Style,
|
|
||||||
) -> egui::text::TextFormat {
|
|
||||||
use egui::{Align, Color32, Stroke, TextStyle};
|
|
||||||
|
|
||||||
let color = if emark_style.strong || emark_style.heading {
|
|
||||||
egui_style.visuals.strong_text_color()
|
|
||||||
} else if emark_style.quoted {
|
|
||||||
egui_style.visuals.weak_text_color()
|
|
||||||
} else {
|
|
||||||
egui_style.visuals.text_color()
|
|
||||||
};
|
|
||||||
|
|
||||||
let text_style = if emark_style.heading {
|
|
||||||
TextStyle::Heading
|
|
||||||
} else if emark_style.code {
|
|
||||||
TextStyle::Monospace
|
|
||||||
} else if emark_style.small | emark_style.raised {
|
|
||||||
TextStyle::Small
|
|
||||||
} else {
|
|
||||||
TextStyle::Body
|
|
||||||
};
|
|
||||||
|
|
||||||
let background = if emark_style.code {
|
|
||||||
egui_style.visuals.code_bg_color
|
|
||||||
} else {
|
|
||||||
Color32::TRANSPARENT
|
|
||||||
};
|
|
||||||
|
|
||||||
let underline = if emark_style.underline {
|
|
||||||
Stroke::new(1.0, color)
|
|
||||||
} else {
|
|
||||||
Stroke::NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
let strikethrough = if emark_style.strikethrough {
|
|
||||||
Stroke::new(1.0, color)
|
|
||||||
} else {
|
|
||||||
Stroke::NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
let valign = if emark_style.raised {
|
|
||||||
Align::TOP
|
|
||||||
} else {
|
|
||||||
Align::BOTTOM
|
|
||||||
};
|
|
||||||
|
|
||||||
egui::text::TextFormat {
|
|
||||||
font_id: text_style.resolve(egui_style),
|
|
||||||
color,
|
|
||||||
background,
|
|
||||||
italics: emark_style.italics,
|
|
||||||
underline,
|
|
||||||
strikethrough,
|
|
||||||
valign,
|
|
||||||
..Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,346 +0,0 @@
|
|||||||
//! A parser for `EasyMark`: a very simple markup language.
|
|
||||||
//!
|
|
||||||
//! WARNING: `EasyMark` is subject to change.
|
|
||||||
//
|
|
||||||
//! # `EasyMark` design goals:
|
|
||||||
//! 1. easy to parse
|
|
||||||
//! 2. easy to learn
|
|
||||||
//! 3. similar to markdown
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
|
||||||
pub enum Item<'a> {
|
|
||||||
/// `\n`
|
|
||||||
// TODO(emilk): add Style here so empty heading still uses up the right amount of space.
|
|
||||||
Newline,
|
|
||||||
|
|
||||||
/// Text
|
|
||||||
Text(Style, &'a str),
|
|
||||||
|
|
||||||
/// title, url
|
|
||||||
Hyperlink(Style, &'a str, &'a str),
|
|
||||||
|
|
||||||
/// leading space before e.g. a [`Self::BulletPoint`].
|
|
||||||
Indentation(usize),
|
|
||||||
|
|
||||||
/// >
|
|
||||||
QuoteIndent,
|
|
||||||
|
|
||||||
/// - a point well made.
|
|
||||||
BulletPoint,
|
|
||||||
|
|
||||||
/// 1. numbered list. The string is the number(s).
|
|
||||||
NumberedPoint(&'a str),
|
|
||||||
|
|
||||||
/// ---
|
|
||||||
Separator,
|
|
||||||
|
|
||||||
/// language, code
|
|
||||||
CodeBlock(&'a str, &'a str),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
|
||||||
pub struct Style {
|
|
||||||
/// # heading (large text)
|
|
||||||
pub heading: bool,
|
|
||||||
|
|
||||||
/// > quoted (slightly dimmer color or other font style)
|
|
||||||
pub quoted: bool,
|
|
||||||
|
|
||||||
/// `code` (monospace, some other color)
|
|
||||||
pub code: bool,
|
|
||||||
|
|
||||||
/// self.strong* (emphasized, e.g. bold)
|
|
||||||
pub strong: bool,
|
|
||||||
|
|
||||||
/// _underline_
|
|
||||||
pub underline: bool,
|
|
||||||
|
|
||||||
/// ~strikethrough~
|
|
||||||
pub strikethrough: bool,
|
|
||||||
|
|
||||||
/// /italics/
|
|
||||||
pub italics: bool,
|
|
||||||
|
|
||||||
/// $small$
|
|
||||||
pub small: bool,
|
|
||||||
|
|
||||||
/// ^raised^
|
|
||||||
pub raised: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parser for the `EasyMark` markup language.
|
|
||||||
pub struct Parser<'a> {
|
|
||||||
/// The remainder of the input text
|
|
||||||
s: &'a str,
|
|
||||||
|
|
||||||
/// Are we at the start of a line?
|
|
||||||
start_of_line: bool,
|
|
||||||
|
|
||||||
/// Current self.style. Reset after a newline.
|
|
||||||
style: Style,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> Parser<'a> {
|
|
||||||
pub fn new(s: &'a str) -> Self {
|
|
||||||
Self {
|
|
||||||
s,
|
|
||||||
start_of_line: true,
|
|
||||||
style: Style::default(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `1. `, `42. ` etc.
|
|
||||||
fn numbered_list(&mut self) -> Option<Item<'a>> {
|
|
||||||
let n_digits = self.s.chars().take_while(|c| c.is_ascii_digit()).count();
|
|
||||||
if n_digits > 0 && self.s.chars().skip(n_digits).take(2).eq(". ".chars()) {
|
|
||||||
let number = &self.s[..n_digits];
|
|
||||||
self.s = &self.s[(n_digits + 2)..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::NumberedPoint(number));
|
|
||||||
}
|
|
||||||
None
|
|
||||||
}
|
|
||||||
|
|
||||||
// ```{language}\n{code}```
|
|
||||||
fn code_block(&mut self) -> Option<Item<'a>> {
|
|
||||||
if let Some(language_start) = self.s.strip_prefix("```") {
|
|
||||||
if let Some(newline) = language_start.find('\n') {
|
|
||||||
let language = &language_start[..newline];
|
|
||||||
let code_start = &language_start[newline + 1..];
|
|
||||||
if let Some(end) = code_start.find("\n```") {
|
|
||||||
let code = &code_start[..end].trim();
|
|
||||||
self.s = &code_start[end + 4..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::CodeBlock(language, code));
|
|
||||||
} else {
|
|
||||||
self.s = "";
|
|
||||||
return Some(Item::CodeBlock(language, code_start));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None
|
|
||||||
}
|
|
||||||
|
|
||||||
// `code`
|
|
||||||
fn inline_code(&mut self) -> Option<Item<'a>> {
|
|
||||||
if let Some(rest) = self.s.strip_prefix('`') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.code = true;
|
|
||||||
let rest_of_line = &self.s[..self.s.find('\n').unwrap_or(self.s.len())];
|
|
||||||
if let Some(end) = rest_of_line.find('`') {
|
|
||||||
let item = Item::Text(self.style, &self.s[..end]);
|
|
||||||
self.s = &self.s[end + 1..];
|
|
||||||
self.style.code = false;
|
|
||||||
return Some(item);
|
|
||||||
} else {
|
|
||||||
let end = rest_of_line.len();
|
|
||||||
let item = Item::Text(self.style, rest_of_line);
|
|
||||||
self.s = &self.s[end..];
|
|
||||||
self.style.code = false;
|
|
||||||
return Some(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `<url>` or `[link](url)`
|
|
||||||
fn url(&mut self) -> Option<Item<'a>> {
|
|
||||||
if self.s.starts_with('<') {
|
|
||||||
let this_line = &self.s[..self.s.find('\n').unwrap_or(self.s.len())];
|
|
||||||
if let Some(url_end) = this_line.find('>') {
|
|
||||||
let url = &self.s[1..url_end];
|
|
||||||
self.s = &self.s[url_end + 1..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::Hyperlink(self.style, url, url));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// [text](url)
|
|
||||||
if self.s.starts_with('[') {
|
|
||||||
let this_line = &self.s[..self.s.find('\n').unwrap_or(self.s.len())];
|
|
||||||
if let Some(bracket_end) = this_line.find(']') {
|
|
||||||
let text = &this_line[1..bracket_end];
|
|
||||||
if this_line[bracket_end + 1..].starts_with('(') {
|
|
||||||
if let Some(parens_end) = this_line[bracket_end + 2..].find(')') {
|
|
||||||
let parens_end = bracket_end + 2 + parens_end;
|
|
||||||
let url = &self.s[bracket_end + 2..parens_end];
|
|
||||||
self.s = &self.s[parens_end + 1..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::Hyperlink(self.style, text, url));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> Iterator for Parser<'a> {
|
|
||||||
type Item = Item<'a>;
|
|
||||||
|
|
||||||
fn next(&mut self) -> Option<Self::Item> {
|
|
||||||
loop {
|
|
||||||
if self.s.is_empty() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
// \n
|
|
||||||
if self.s.starts_with('\n') {
|
|
||||||
self.s = &self.s[1..];
|
|
||||||
self.start_of_line = true;
|
|
||||||
self.style = Style::default();
|
|
||||||
return Some(Item::Newline);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ignore line break (continue on the same line)
|
|
||||||
if self.s.starts_with("\\\n") && self.s.len() >= 2 {
|
|
||||||
self.s = &self.s[2..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// \ escape (to show e.g. a backtick)
|
|
||||||
if self.s.starts_with('\\') && self.s.len() >= 2 {
|
|
||||||
let text = &self.s[1..2];
|
|
||||||
self.s = &self.s[2..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::Text(self.style, text));
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.start_of_line {
|
|
||||||
// leading space (indentation)
|
|
||||||
if self.s.starts_with(' ') {
|
|
||||||
let length = self.s.find(|c| c != ' ').unwrap_or(self.s.len());
|
|
||||||
self.s = &self.s[length..];
|
|
||||||
self.start_of_line = true; // indentation doesn't count
|
|
||||||
return Some(Item::Indentation(length));
|
|
||||||
}
|
|
||||||
|
|
||||||
// # Heading
|
|
||||||
if let Some(after) = self.s.strip_prefix("# ") {
|
|
||||||
self.s = after;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.heading = true;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// > quote
|
|
||||||
if let Some(after) = self.s.strip_prefix("> ") {
|
|
||||||
self.s = after;
|
|
||||||
self.start_of_line = true; // quote indentation doesn't count
|
|
||||||
self.style.quoted = true;
|
|
||||||
return Some(Item::QuoteIndent);
|
|
||||||
}
|
|
||||||
|
|
||||||
// - bullet point
|
|
||||||
if self.s.starts_with("- ") {
|
|
||||||
self.s = &self.s[2..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::BulletPoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
// `1. `, `42. ` etc.
|
|
||||||
if let Some(item) = self.numbered_list() {
|
|
||||||
return Some(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- separator
|
|
||||||
if let Some(after) = self.s.strip_prefix("---") {
|
|
||||||
self.s = after.trim_start_matches('-'); // remove extra dashes
|
|
||||||
self.s = self.s.strip_prefix('\n').unwrap_or(self.s); // remove trailing newline
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(Item::Separator);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ```{language}\n{code}```
|
|
||||||
if let Some(item) = self.code_block() {
|
|
||||||
return Some(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// `code`
|
|
||||||
if let Some(item) = self.inline_code() {
|
|
||||||
return Some(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(rest) = self.s.strip_prefix('*') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.strong = !self.style.strong;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if let Some(rest) = self.s.strip_prefix('_') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.underline = !self.style.underline;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if let Some(rest) = self.s.strip_prefix('~') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.strikethrough = !self.style.strikethrough;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if let Some(rest) = self.s.strip_prefix('/') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.italics = !self.style.italics;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if let Some(rest) = self.s.strip_prefix('$') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.small = !self.style.small;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if let Some(rest) = self.s.strip_prefix('^') {
|
|
||||||
self.s = rest;
|
|
||||||
self.start_of_line = false;
|
|
||||||
self.style.raised = !self.style.raised;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// `<url>` or `[link](url)`
|
|
||||||
if let Some(item) = self.url() {
|
|
||||||
return Some(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Swallow everything up to the next special character:
|
|
||||||
let end = self
|
|
||||||
.s
|
|
||||||
.find(&['*', '`', '~', '_', '/', '$', '^', '\\', '<', '[', '\n'][..])
|
|
||||||
.map_or_else(|| self.s.len(), |special| special.max(1));
|
|
||||||
|
|
||||||
let item = Item::Text(self.style, &self.s[..end]);
|
|
||||||
self.s = &self.s[end..];
|
|
||||||
self.start_of_line = false;
|
|
||||||
return Some(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_easy_mark_parser() {
|
|
||||||
let items: Vec<_> = Parser::new("~strikethrough `code`~").collect();
|
|
||||||
assert_eq!(
|
|
||||||
items,
|
|
||||||
vec![
|
|
||||||
Item::Text(
|
|
||||||
Style {
|
|
||||||
strikethrough: true,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
"strikethrough "
|
|
||||||
),
|
|
||||||
Item::Text(
|
|
||||||
Style {
|
|
||||||
code: true,
|
|
||||||
strikethrough: true,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
"code"
|
|
||||||
),
|
|
||||||
]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
//! Experimental markup language
|
|
||||||
|
|
||||||
mod easy_mark_highlighter;
|
|
||||||
pub mod easy_mark_parser;
|
|
||||||
|
|
||||||
pub use easy_mark_highlighter::{MemoizedHighlighter, highlight_easymark};
|
|
||||||
pub use easy_mark_parser as parser;
|
|
||||||
@ -30,7 +30,7 @@ pub struct FileEditor {
|
|||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
pub enum BufferItem {
|
pub enum BufferItem {
|
||||||
Text(MdTextEdit),
|
Text(MdTextEdit),
|
||||||
Handwriting(Handwriting),
|
Handwriting(Box<Handwriting>),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl FileEditor {
|
impl FileEditor {
|
||||||
@ -151,6 +151,7 @@ impl FileEditor {
|
|||||||
BufferItem::Handwriting(handwriting) => {
|
BufferItem::Handwriting(handwriting) => {
|
||||||
let style = HandwritingStyle {
|
let style = HandwritingStyle {
|
||||||
animate: preferences.animations,
|
animate: preferences.animations,
|
||||||
|
hide_cursor: preferences.hide_handwriting_cursor,
|
||||||
..HandwritingStyle::from_theme(ui.ctx().theme())
|
..HandwritingStyle::from_theme(ui.ctx().theme())
|
||||||
};
|
};
|
||||||
if handwriting.ui(&style, ui).changed {
|
if handwriting.ui(&style, ui).changed {
|
||||||
@ -169,7 +170,7 @@ impl FileEditor {
|
|||||||
dragger_rect.set_height(item_response.response.rect.height());
|
dragger_rect.set_height(item_response.response.rect.height());
|
||||||
|
|
||||||
// Controls for moving the buffer item
|
// Controls for moving the buffer item
|
||||||
ui.allocate_new_ui(
|
ui.scope_builder(
|
||||||
UiBuilder::new()
|
UiBuilder::new()
|
||||||
.max_rect(dragger_rect)
|
.max_rect(dragger_rect)
|
||||||
.layout(Layout::top_down(Align::Center)),
|
.layout(Layout::top_down(Align::Center)),
|
||||||
@ -297,7 +298,7 @@ impl From<&str> for FileEditor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
buffer.push(BufferItem::Handwriting(handwriting))
|
buffer.push(BufferItem::Handwriting(Box::new(handwriting)))
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to decode handwriting {content:?}: {e}");
|
log::error!("Failed to decode handwriting {content:?}: {e}");
|
||||||
|
|||||||
218
src/folder.rs
Normal file
218
src/folder.rs
Normal file
@ -0,0 +1,218 @@
|
|||||||
|
use std::{
|
||||||
|
fs::read_dir,
|
||||||
|
mem,
|
||||||
|
ops::Deref,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
sync::mpsc,
|
||||||
|
thread,
|
||||||
|
};
|
||||||
|
|
||||||
|
use egui::{Response, Ui};
|
||||||
|
use eyre::{Context, OptionExt, eyre};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
pub enum Folder {
|
||||||
|
NotLoaded {
|
||||||
|
name: String,
|
||||||
|
path: PathBuf,
|
||||||
|
},
|
||||||
|
Loading {
|
||||||
|
name: String,
|
||||||
|
path: PathBuf,
|
||||||
|
recv: mpsc::Receiver<LoadedFolder>,
|
||||||
|
},
|
||||||
|
Loaded(LoadedFolder),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct LoadedFolder {
|
||||||
|
pub name: String,
|
||||||
|
pub path: PathBuf,
|
||||||
|
pub child_folders: Vec<Folder>,
|
||||||
|
pub child_files: Vec<File>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct File {
|
||||||
|
pub name: String,
|
||||||
|
pub path: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FolderResponse<'a> {
|
||||||
|
inner: Response,
|
||||||
|
pub open_file: Option<&'a Path>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deref for FolderResponse<'_> {
|
||||||
|
type Target = Response;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.inner
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LoadedFolder {
|
||||||
|
pub fn show<'a>(&'a mut self, ui: &mut Ui) -> FolderResponse<'a> {
|
||||||
|
let mut open_file = None;
|
||||||
|
let inner = ui
|
||||||
|
.collapsing(&self.name, |ui| {
|
||||||
|
for folder in &mut self.child_folders {
|
||||||
|
open_file = open_file.or(folder.show(ui).open_file);
|
||||||
|
}
|
||||||
|
|
||||||
|
for file in &mut self.child_files {
|
||||||
|
if ui.button(&file.name).clicked() {
|
||||||
|
open_file = Some(file.path.as_path())
|
||||||
|
};
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.header_response;
|
||||||
|
|
||||||
|
FolderResponse { inner, open_file }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load(path: PathBuf) -> eyre::Result<Self> {
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.ok_or_eyre("Path is missing a file-name")?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let mut child_folders = vec![];
|
||||||
|
let mut child_files = vec![];
|
||||||
|
|
||||||
|
for entry in read_dir(&path).with_context(|| eyre!("Couldn't read dir {path:?}"))? {
|
||||||
|
let entry = entry.with_context(|| eyre!("Couldn't read dir {path:?}"))?;
|
||||||
|
let path = entry.path();
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.ok_or_eyre("Path is missing a file-name")?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let file_type = entry.file_type()?;
|
||||||
|
|
||||||
|
if file_type.is_symlink() {
|
||||||
|
log::error!("Symlinks not yet supported, skipping {path:?}");
|
||||||
|
continue;
|
||||||
|
} else if file_type.is_file() {
|
||||||
|
child_files.push(File { name, path });
|
||||||
|
} else if file_type.is_dir() {
|
||||||
|
child_folders.push(Folder::NotLoaded { name, path });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let folder = LoadedFolder {
|
||||||
|
name,
|
||||||
|
path,
|
||||||
|
child_folders,
|
||||||
|
child_files,
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(folder)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Folder {
|
||||||
|
fn load(&mut self, ui: &mut Ui) -> Option<&mut LoadedFolder> {
|
||||||
|
if let Folder::NotLoaded { name, path } = self {
|
||||||
|
let (tx, rx) = mpsc::channel();
|
||||||
|
|
||||||
|
{
|
||||||
|
let path = path.clone();
|
||||||
|
let ctx = ui.ctx().clone();
|
||||||
|
thread::spawn(move || match LoadedFolder::load(path) {
|
||||||
|
Err(e) => log::error!("Failed to load folder: {e}"),
|
||||||
|
Ok(folder) => {
|
||||||
|
let _ = tx.send(folder);
|
||||||
|
ctx.request_repaint();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
*self = Folder::Loading {
|
||||||
|
name: mem::take(name),
|
||||||
|
path: mem::take(path),
|
||||||
|
recv: rx,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Folder::Loading { recv, .. } = self {
|
||||||
|
match recv.try_recv() {
|
||||||
|
Ok(folder) => *self = Folder::Loaded(folder),
|
||||||
|
Err(_) => return None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let Folder::Loaded(folder) = self else {
|
||||||
|
unreachable!()
|
||||||
|
};
|
||||||
|
|
||||||
|
Some(folder)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn show<'a>(&'a mut self, ui: &mut Ui) -> FolderResponse<'a> {
|
||||||
|
self.load(ui);
|
||||||
|
|
||||||
|
if let Folder::Loaded(folder) = self {
|
||||||
|
return folder.show(ui);
|
||||||
|
}
|
||||||
|
|
||||||
|
FolderResponse {
|
||||||
|
inner: ui.label(self.name()),
|
||||||
|
open_file: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn path(&self) -> &Path {
|
||||||
|
match self {
|
||||||
|
Folder::NotLoaded { path, .. } => path,
|
||||||
|
Folder::Loading { path, .. } => path,
|
||||||
|
Folder::Loaded(folder) => &folder.path,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn name(&self) -> &str {
|
||||||
|
match self {
|
||||||
|
Folder::NotLoaded { name, .. } => name,
|
||||||
|
Folder::Loading { name, .. } => name,
|
||||||
|
Folder::Loaded(folder) => &folder.name,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn unload(&mut self) {
|
||||||
|
let (name, path) = match self {
|
||||||
|
Folder::NotLoaded { .. } => return,
|
||||||
|
Folder::Loading { name, path, .. } => (name, path),
|
||||||
|
Folder::Loaded(folder) => (&mut folder.name, &mut folder.path),
|
||||||
|
};
|
||||||
|
|
||||||
|
*self = Folder::NotLoaded {
|
||||||
|
name: mem::take(name),
|
||||||
|
path: mem::take(path),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Serialize for Folder {
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: serde::Serializer,
|
||||||
|
{
|
||||||
|
self.path().serialize(serializer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'de> Deserialize<'de> for Folder {
|
||||||
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||||
|
where
|
||||||
|
D: serde::Deserializer<'de>,
|
||||||
|
{
|
||||||
|
use serde::de::Error;
|
||||||
|
let path = PathBuf::deserialize(deserializer)?;
|
||||||
|
let name = path
|
||||||
|
.file_name()
|
||||||
|
.ok_or(D::Error::custom("Path is missing a file-name"))?
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string();
|
||||||
|
Ok(Folder::NotLoaded { name, path })
|
||||||
|
}
|
||||||
|
}
|
||||||
3
src/handwriting/advanced-example.md
Normal file
3
src/handwriting/advanced-example.md
Normal file
File diff suppressed because one or more lines are too long
176
src/handwriting/canvas_rasterizer.rs
Normal file
176
src/handwriting/canvas_rasterizer.rs
Normal file
@ -0,0 +1,176 @@
|
|||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use egui::{
|
||||||
|
Color32, ColorImage, CornerRadius, Painter, Pos2, Rect, Stroke, StrokeKind, TextureHandle,
|
||||||
|
Vec2,
|
||||||
|
ahash::HashMap,
|
||||||
|
emath::TSTransform,
|
||||||
|
epaint::{Brush, RectShape, Vertex},
|
||||||
|
load::SizedTexture,
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::rasterizer::{PxBoundingBox, rasterize_triangle_onto, triangle_bounding_box};
|
||||||
|
|
||||||
|
use super::StrokeBlendMode;
|
||||||
|
|
||||||
|
const CHUNK_SIZE: usize = 64;
|
||||||
|
|
||||||
|
/// Rasterize onto a resizeable canvas.
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct CanvasRasterizer {
|
||||||
|
image_size: [usize; 2],
|
||||||
|
tiles: HashMap<[usize; 2], Tile>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Tile {
|
||||||
|
bounding_box: PxBoundingBox,
|
||||||
|
image: ColorImage,
|
||||||
|
texture: Option<TextureHandle>,
|
||||||
|
texture_is_dirty: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Tile {
|
||||||
|
fn new(xi: usize, yi: usize) -> Self {
|
||||||
|
let x_from = xi * CHUNK_SIZE;
|
||||||
|
let y_from = yi * CHUNK_SIZE;
|
||||||
|
let bounding_box = PxBoundingBox {
|
||||||
|
x_from,
|
||||||
|
y_from,
|
||||||
|
x_to: x_from + CHUNK_SIZE,
|
||||||
|
y_to: y_from + CHUNK_SIZE,
|
||||||
|
};
|
||||||
|
|
||||||
|
Self {
|
||||||
|
bounding_box,
|
||||||
|
image: ColorImage::new([CHUNK_SIZE, CHUNK_SIZE], Color32::TRANSPARENT),
|
||||||
|
texture: None,
|
||||||
|
texture_is_dirty: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CanvasRasterizer {
|
||||||
|
pub fn set_size(&mut self, width: usize, height: usize) {
|
||||||
|
self.image_size = [width, height];
|
||||||
|
self.populate_tiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn clear(&mut self) {
|
||||||
|
log::debug!("clearing all tiles");
|
||||||
|
self.tiles.clear();
|
||||||
|
self.populate_tiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn populate_tiles(&mut self) {
|
||||||
|
let [width, height] = self.image_size;
|
||||||
|
|
||||||
|
// discard tiles that are out of bounds
|
||||||
|
self.tiles.retain(|_, tile| {
|
||||||
|
tile.bounding_box.x_from <= width && tile.bounding_box.y_from <= height
|
||||||
|
});
|
||||||
|
|
||||||
|
let chunk = |max: usize| {
|
||||||
|
(0..)
|
||||||
|
.step_by(CHUNK_SIZE)
|
||||||
|
.take_while(move |n| n <= &max)
|
||||||
|
.enumerate()
|
||||||
|
};
|
||||||
|
|
||||||
|
// create new tiles where we need them
|
||||||
|
for (xi, _x) in chunk(width) {
|
||||||
|
for (yi, _y) in chunk(height) {
|
||||||
|
self.tiles
|
||||||
|
.entry([xi, yi])
|
||||||
|
.or_insert_with(|| Tile::new(xi, yi));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn rasterize<'a>(
|
||||||
|
&mut self,
|
||||||
|
point_to_pixel: TSTransform,
|
||||||
|
triangles: impl Iterator<Item = [&'a Vertex; 3]> + Clone,
|
||||||
|
) {
|
||||||
|
for triangle in triangles {
|
||||||
|
let triangle_bounding_box = triangle_bounding_box(&triangle, point_to_pixel);
|
||||||
|
for chunk in chunks_from_bounding_box(triangle_bounding_box) {
|
||||||
|
let Some(tile) = self.tiles.get_mut(&chunk) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut point_to_tile_pixel = point_to_pixel;
|
||||||
|
point_to_tile_pixel.translation -= Vec2::new(
|
||||||
|
tile.bounding_box.x_from as f32,
|
||||||
|
tile.bounding_box.y_from as f32,
|
||||||
|
);
|
||||||
|
|
||||||
|
tile.texture_is_dirty = true;
|
||||||
|
rasterize_triangle_onto::<StrokeBlendMode>(
|
||||||
|
&mut tile.image,
|
||||||
|
point_to_tile_pixel,
|
||||||
|
triangle,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `at` defines the location in screen-coordinates where the canvas should be drawn.
|
||||||
|
pub fn show(&mut self, ctx: &egui::Context, painter: &Painter, at: Rect) {
|
||||||
|
let pixels_per_point = ctx.pixels_per_point();
|
||||||
|
let chunk_vec = Vec2::splat(CHUNK_SIZE as f32) / pixels_per_point;
|
||||||
|
|
||||||
|
for ([xi, yi], tile) in &mut self.tiles {
|
||||||
|
if tile.texture_is_dirty {
|
||||||
|
tile.texture_is_dirty = false;
|
||||||
|
if let Some(texture) = &mut tile.texture {
|
||||||
|
texture.set(tile.image.clone(), Default::default());
|
||||||
|
} else {
|
||||||
|
tile.texture = Some(ctx.load_texture(
|
||||||
|
"handwriting",
|
||||||
|
tile.image.clone(),
|
||||||
|
Default::default(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(texture) = &mut tile.texture {
|
||||||
|
let texture = SizedTexture::new(texture.id(), texture.size_vec2());
|
||||||
|
let shape = RectShape {
|
||||||
|
rect: Rect::from_min_size(
|
||||||
|
at.min + Vec2::new(*xi as f32, *yi as f32) * chunk_vec,
|
||||||
|
chunk_vec,
|
||||||
|
),
|
||||||
|
corner_radius: CornerRadius::ZERO,
|
||||||
|
fill: Color32::WHITE,
|
||||||
|
stroke: Stroke::NONE,
|
||||||
|
stroke_kind: StrokeKind::Inside,
|
||||||
|
round_to_pixels: None,
|
||||||
|
blur_width: 0.0,
|
||||||
|
brush: Some(Arc::new(Brush {
|
||||||
|
fill_texture_id: texture.id,
|
||||||
|
uv: Rect {
|
||||||
|
min: Pos2::ZERO,
|
||||||
|
max: Pos2::new(1.0, 1.0),
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
painter.add(shape);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get all chunk indices that overlaps with a PxBoundingBox.
|
||||||
|
fn chunks_from_bounding_box(
|
||||||
|
triangle_bounding_box: PxBoundingBox,
|
||||||
|
) -> impl Iterator<Item = [usize; 2]> {
|
||||||
|
let x_from_chunk = triangle_bounding_box.x_from / CHUNK_SIZE;
|
||||||
|
let y_from_chunk = triangle_bounding_box.y_from / CHUNK_SIZE;
|
||||||
|
let x_to_chunk = triangle_bounding_box.x_to.saturating_sub(1) / CHUNK_SIZE;
|
||||||
|
let y_to_chunk = triangle_bounding_box.y_to.saturating_sub(1) / CHUNK_SIZE;
|
||||||
|
|
||||||
|
let xs = x_from_chunk..=x_to_chunk;
|
||||||
|
let ys = y_from_chunk..=y_to_chunk;
|
||||||
|
|
||||||
|
ys.flat_map(move |yi| xs.clone().map(move |xi| [xi, yi]))
|
||||||
|
}
|
||||||
@ -1,3 +1,6 @@
|
|||||||
|
mod canvas_rasterizer;
|
||||||
|
mod disk_format;
|
||||||
|
|
||||||
use std::{
|
use std::{
|
||||||
fmt::{self, Display},
|
fmt::{self, Display},
|
||||||
iter, mem,
|
iter, mem,
|
||||||
@ -6,27 +9,22 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use base64::{Engine, prelude::BASE64_STANDARD};
|
use base64::{Engine, prelude::BASE64_STANDARD};
|
||||||
|
use canvas_rasterizer::CanvasRasterizer;
|
||||||
use disk_format::{DiskFormat, RawStroke, RawStrokeHeader, f16_le};
|
use disk_format::{DiskFormat, RawStroke, RawStrokeHeader, f16_le};
|
||||||
use egui::{
|
use egui::{
|
||||||
Color32, ColorImage, CornerRadius, Event, Frame, Id, Mesh, PointerButton, Pos2, Rect, Sense,
|
Color32, Event, Frame, Id, Mesh, PointerButton, Pos2, Rect, Sense, Shape, Stroke, Theme, Ui,
|
||||||
Shape, Stroke, TextureHandle, Theme, Ui, Vec2,
|
Vec2,
|
||||||
emath::{self, TSTransform},
|
emath::{self, TSTransform},
|
||||||
epaint::{Brush, RectShape, TessellationOptions, Tessellator, Vertex},
|
epaint::{TessellationOptions, Tessellator, Vertex},
|
||||||
load::SizedTexture,
|
|
||||||
};
|
};
|
||||||
use eyre::{Context, bail};
|
use eyre::{Context, bail};
|
||||||
use eyre::{OptionExt, eyre};
|
use eyre::{OptionExt, eyre};
|
||||||
use half::f16;
|
use half::f16;
|
||||||
use zerocopy::{FromBytes, IntoBytes};
|
use zerocopy::{FromBytes, IntoBytes};
|
||||||
|
|
||||||
use crate::{
|
use crate::{custom_code_block::try_from_custom_code_block, rasterizer};
|
||||||
custom_code_block::try_from_custom_code_block,
|
|
||||||
rasterizer::{self, rasterize, rasterize_onto},
|
|
||||||
};
|
|
||||||
use crate::{custom_code_block::write_custom_code_block, util::random_id};
|
use crate::{custom_code_block::write_custom_code_block, util::random_id};
|
||||||
|
|
||||||
mod disk_format;
|
|
||||||
|
|
||||||
const HANDWRITING_MIN_HEIGHT: f32 = 100.0;
|
const HANDWRITING_MIN_HEIGHT: f32 = 100.0;
|
||||||
const HANDWRITING_BOTTOM_PADDING: f32 = 80.0;
|
const HANDWRITING_BOTTOM_PADDING: f32 = 80.0;
|
||||||
const HANDWRITING_MARGIN: f32 = 0.05;
|
const HANDWRITING_MARGIN: f32 = 0.05;
|
||||||
@ -36,7 +34,7 @@ pub const CODE_BLOCK_KEY: &str = "handwriting";
|
|||||||
|
|
||||||
type StrokeBlendMode = rasterizer::blend::Normal;
|
type StrokeBlendMode = rasterizer::blend::Normal;
|
||||||
|
|
||||||
const TESSELATION_OPTIONS: TessellationOptions = TessellationOptions {
|
const TESSELLATION_OPTIONS: TessellationOptions = TessellationOptions {
|
||||||
feathering: true,
|
feathering: true,
|
||||||
feathering_size_in_pixels: 1.0,
|
feathering_size_in_pixels: 1.0,
|
||||||
coarse_tessellation_culling: true,
|
coarse_tessellation_culling: true,
|
||||||
@ -58,42 +56,41 @@ pub struct HandwritingStyle {
|
|||||||
pub bg_line_stroke: Stroke,
|
pub bg_line_stroke: Stroke,
|
||||||
pub bg_color: Color32,
|
pub bg_color: Color32,
|
||||||
pub animate: bool,
|
pub animate: bool,
|
||||||
|
pub hide_cursor: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
#[derive(serde::Deserialize, serde::Serialize)]
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub struct Handwriting {
|
pub struct Handwriting {
|
||||||
#[serde(skip, default = "random_id")]
|
|
||||||
id: Id,
|
|
||||||
|
|
||||||
strokes: Vec<Vec<Pos2>>,
|
strokes: Vec<Vec<Pos2>>,
|
||||||
|
|
||||||
/// The stroke that is currently being drawed.
|
|
||||||
#[serde(skip)]
|
|
||||||
current_stroke: Vec<Pos2>,
|
|
||||||
|
|
||||||
/// The lines that have not been blitted to `texture` yet.
|
|
||||||
#[serde(skip)]
|
|
||||||
unblitted_lines: Vec<[Pos2; 2]>,
|
|
||||||
|
|
||||||
height: f32,
|
height: f32,
|
||||||
desired_height: f32,
|
desired_height: f32,
|
||||||
|
|
||||||
/// Tesselated mesh of all strokes
|
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
|
e: Ephemeral,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handwriting data that isn't persisted across restarts.
|
||||||
|
struct Ephemeral {
|
||||||
|
id: Id,
|
||||||
|
|
||||||
|
canvas_rasterizer: CanvasRasterizer,
|
||||||
|
|
||||||
|
/// The stroke that is currently being drawed.
|
||||||
|
current_stroke: Vec<Pos2>,
|
||||||
|
|
||||||
|
/// The lines that have not been blitted to `texture` yet.
|
||||||
|
unblitted_lines: Vec<[Pos2; 2]>,
|
||||||
|
|
||||||
|
tessellator: Option<Tessellator>,
|
||||||
|
|
||||||
|
/// Tessellated mesh of all strokes
|
||||||
mesh: Arc<Mesh>,
|
mesh: Arc<Mesh>,
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
texture: Option<TextureHandle>,
|
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
image: ColorImage,
|
|
||||||
|
|
||||||
#[serde(skip)]
|
|
||||||
refresh_texture: bool,
|
refresh_texture: bool,
|
||||||
|
|
||||||
/// Context of the last mesh render.
|
/// Context of the last mesh render.
|
||||||
#[serde(skip)]
|
|
||||||
last_mesh_ctx: Option<MeshContext>,
|
last_mesh_ctx: Option<MeshContext>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,56 +106,28 @@ struct MeshContext {
|
|||||||
|
|
||||||
pub pixels_per_point: f32,
|
pub pixels_per_point: f32,
|
||||||
|
|
||||||
/// Canvas size in points
|
|
||||||
pub size: Vec2,
|
|
||||||
|
|
||||||
pub stroke: Stroke,
|
pub stroke: Stroke,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get [Painting::texture], initializing it if necessary.
|
|
||||||
macro_rules! texture {
|
|
||||||
($self_:expr, $ui:expr, $mesh_context:expr) => {{
|
|
||||||
let ui: &Ui = $ui;
|
|
||||||
let mesh_context: &MeshContext = $mesh_context;
|
|
||||||
let image_size = mesh_context.pixel_size();
|
|
||||||
|
|
||||||
let new_image = || {
|
|
||||||
let image = ColorImage::new(image_size, Color32::TRANSPARENT);
|
|
||||||
ui.ctx()
|
|
||||||
.load_texture("handwriting", image, Default::default())
|
|
||||||
};
|
|
||||||
|
|
||||||
let texture = $self_.texture.get_or_insert_with(new_image);
|
|
||||||
|
|
||||||
if texture.size() != image_size {
|
|
||||||
$self_.refresh_texture = true;
|
|
||||||
// TODO: don't redraw the entire mesh, just blit the old texture onto the new one
|
|
||||||
*texture = new_image()
|
|
||||||
};
|
|
||||||
|
|
||||||
texture
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MeshContext {
|
|
||||||
/// Calculate canvas size in pixels
|
|
||||||
pub fn pixel_size(&self) -> [usize; 2] {
|
|
||||||
let Vec2 { x, y } = self.size * self.pixels_per_point;
|
|
||||||
[x, y].map(|f| f.ceil() as usize)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for Handwriting {
|
impl Default for Handwriting {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
id: random_id(),
|
|
||||||
strokes: Default::default(),
|
strokes: Default::default(),
|
||||||
current_stroke: Default::default(),
|
|
||||||
height: HANDWRITING_MIN_HEIGHT,
|
height: HANDWRITING_MIN_HEIGHT,
|
||||||
desired_height: HANDWRITING_MIN_HEIGHT,
|
desired_height: HANDWRITING_MIN_HEIGHT,
|
||||||
|
e: Default::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Ephemeral {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: random_id(),
|
||||||
|
canvas_rasterizer: Default::default(),
|
||||||
|
current_stroke: Default::default(),
|
||||||
|
tessellator: None,
|
||||||
mesh: Default::default(),
|
mesh: Default::default(),
|
||||||
texture: None,
|
|
||||||
image: ColorImage::new([0, 0], Color32::WHITE),
|
|
||||||
refresh_texture: true,
|
refresh_texture: true,
|
||||||
last_mesh_ctx: None,
|
last_mesh_ctx: None,
|
||||||
unblitted_lines: Default::default(),
|
unblitted_lines: Default::default(),
|
||||||
@ -180,32 +149,26 @@ impl Handwriting {
|
|||||||
ui.separator();
|
ui.separator();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ui.button("Clear Painting").clicked() {
|
if ui.button("clear").clicked() {
|
||||||
self.strokes.clear();
|
self.strokes.clear();
|
||||||
self.refresh_texture = true;
|
self.e.refresh_texture = true;
|
||||||
response.changed = true;
|
response.changed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.add_enabled_ui(!self.strokes.is_empty(), |ui| {
|
ui.add_enabled_ui(!self.strokes.is_empty(), |ui| {
|
||||||
if ui.button("Undo").clicked() {
|
if ui.button("undo").clicked() {
|
||||||
self.strokes.pop();
|
self.strokes.pop();
|
||||||
self.refresh_texture = true;
|
self.e.refresh_texture = true;
|
||||||
response.changed = true;
|
response.changed = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let vertex_count: usize = self.mesh.indices.len() / 3;
|
let vertex_count: usize = self.e.mesh.indices.len() / 3;
|
||||||
ui.label(format!("vertices: {vertex_count}"));
|
ui.label(format!("vertices: {vertex_count}"));
|
||||||
})
|
})
|
||||||
.response
|
.response
|
||||||
}
|
}
|
||||||
|
|
||||||
fn commit_current_line(&mut self, response: &mut HandwritingResponse) {
|
|
||||||
debug_assert!(!self.current_stroke.is_empty());
|
|
||||||
self.strokes.push(mem::take(&mut self.current_stroke));
|
|
||||||
response.changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn ui_content(
|
pub fn ui_content(
|
||||||
&mut self,
|
&mut self,
|
||||||
style: &HandwritingStyle,
|
style: &HandwritingStyle,
|
||||||
@ -214,7 +177,7 @@ impl Handwriting {
|
|||||||
) -> egui::Response {
|
) -> egui::Response {
|
||||||
if style.animate {
|
if style.animate {
|
||||||
self.height = ui.ctx().animate_value_with_time(
|
self.height = ui.ctx().animate_value_with_time(
|
||||||
self.id.with("height animation"),
|
self.e.id.with("height animation"),
|
||||||
self.desired_height,
|
self.desired_height,
|
||||||
0.4,
|
0.4,
|
||||||
);
|
);
|
||||||
@ -223,12 +186,11 @@ impl Handwriting {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let desired_size = Vec2::new(ui.available_width(), self.height);
|
let desired_size = Vec2::new(ui.available_width(), self.height);
|
||||||
let (response, painter) = ui.allocate_painter(desired_size, Sense::drag());
|
let (mut response, painter) = ui.allocate_painter(desired_size, Sense::drag());
|
||||||
|
|
||||||
let mut response = response
|
if style.hide_cursor {
|
||||||
//.on_hover_cursor(CursorIcon::Crosshair)
|
response = response.on_hover_and_drag_cursor(egui::CursorIcon::None);
|
||||||
//.on_hover_and_drag_cursor(CursorIcon::None)
|
}
|
||||||
;
|
|
||||||
|
|
||||||
let size = response.rect.size();
|
let size = response.rect.size();
|
||||||
|
|
||||||
@ -241,7 +203,7 @@ impl Handwriting {
|
|||||||
let from_screen = to_screen.inverse();
|
let from_screen = to_screen.inverse();
|
||||||
|
|
||||||
// Was the user in the process of drawing a stroke last frame?
|
// Was the user in the process of drawing a stroke last frame?
|
||||||
let was_drawing = !self.current_stroke.is_empty();
|
let was_drawing = !self.e.current_stroke.is_empty();
|
||||||
|
|
||||||
// Is the user in the process of drawing a stroke now?
|
// Is the user in the process of drawing a stroke now?
|
||||||
let is_drawing = response.interact_pointer_pos().is_some();
|
let is_drawing = response.interact_pointer_pos().is_some();
|
||||||
@ -289,17 +251,17 @@ impl Handwriting {
|
|||||||
_ => Some(next),
|
_ => Some(next),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.cloned()
|
|
||||||
.filter(|event| {
|
.filter(|event| {
|
||||||
// FIXME: pinenote: PointerMoved are duplicated after the MouseMoved events
|
// FIXME: pinenote: PointerMoved are duplicated after the MouseMoved events
|
||||||
cfg!(not(feature = "pinenote")) || !matches!(event, Event::PointerMoved(..))
|
cfg!(not(feature = "pinenote")) || !matches!(event, Event::PointerMoved(..))
|
||||||
})
|
})
|
||||||
|
.cloned()
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
});
|
});
|
||||||
|
|
||||||
// Process input events and turn them into strokes
|
// Process input events and turn them into strokes
|
||||||
for event in events {
|
for event in events {
|
||||||
let last_canvas_pos = self.current_stroke.last();
|
let last_canvas_pos = self.e.current_stroke.last();
|
||||||
|
|
||||||
match event {
|
match event {
|
||||||
Event::PointerMoved(new_position) => {
|
Event::PointerMoved(new_position) => {
|
||||||
@ -341,7 +303,7 @@ impl Handwriting {
|
|||||||
} => match (button, pressed) {
|
} => match (button, pressed) {
|
||||||
(PointerButton::Primary, true) => {
|
(PointerButton::Primary, true) => {
|
||||||
if last_canvas_pos.is_none() {
|
if last_canvas_pos.is_none() {
|
||||||
self.current_stroke.push(from_screen * pos);
|
self.e.current_stroke.push(from_screen * pos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(PointerButton::Primary, false) => {
|
(PointerButton::Primary, false) => {
|
||||||
@ -363,7 +325,7 @@ impl Handwriting {
|
|||||||
// TODO: In theory, we can get multiple press->draw->release series
|
// TODO: In theory, we can get multiple press->draw->release series
|
||||||
// in the same frame. Should handle this.
|
// in the same frame. Should handle this.
|
||||||
Event::PointerGone | Event::WindowFocused(false) => {
|
Event::PointerGone | Event::WindowFocused(false) => {
|
||||||
if !self.current_stroke.is_empty() {
|
if !self.e.current_stroke.is_empty() {
|
||||||
self.commit_current_line(hw_response);
|
self.commit_current_line(hw_response);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -397,7 +359,7 @@ impl Handwriting {
|
|||||||
painter.add(shape);
|
painter.add(shape);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Get the dimensions of the image
|
// Get the position and dimensions of the image
|
||||||
let mesh_rect = response
|
let mesh_rect = response
|
||||||
.rect
|
.rect
|
||||||
.with_max_y(response.rect.min.y + self.desired_height);
|
.with_max_y(response.rect.min.y + self.desired_height);
|
||||||
@ -406,107 +368,102 @@ impl Handwriting {
|
|||||||
let new_context = MeshContext {
|
let new_context = MeshContext {
|
||||||
ui_theme: ui.ctx().theme(),
|
ui_theme: ui.ctx().theme(),
|
||||||
pixels_per_point: ui.pixels_per_point(),
|
pixels_per_point: ui.pixels_per_point(),
|
||||||
size: mesh_rect.size(),
|
|
||||||
stroke: style.stroke,
|
stroke: style.stroke,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Figure out if we need to re-rasterize the mesh.
|
// Figure out if we need to re-rasterize the mesh.
|
||||||
if Some(&new_context) != self.last_mesh_ctx.as_ref() {
|
if Some(&new_context) != self.e.last_mesh_ctx.as_ref() {
|
||||||
self.refresh_texture = true;
|
self.e.refresh_texture = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.refresh_texture {
|
let [px_width, px_height] = {
|
||||||
|
let Vec2 { x, y } = mesh_rect.size() * new_context.pixels_per_point;
|
||||||
|
[x, y].map(|f| f.ceil() as usize)
|
||||||
|
};
|
||||||
|
|
||||||
|
self.e.canvas_rasterizer.set_size(px_width, px_height);
|
||||||
|
|
||||||
|
if self.e.refresh_texture {
|
||||||
// ...if we do, rasterize the entire texture from scratch
|
// ...if we do, rasterize the entire texture from scratch
|
||||||
self.refresh_texture(style, new_context, ui);
|
self.refresh_texture(style, new_context);
|
||||||
self.unblitted_lines.clear();
|
self.e.unblitted_lines.clear();
|
||||||
} else if !self.unblitted_lines.is_empty() {
|
} else if !self.e.unblitted_lines.is_empty() {
|
||||||
// ...if we don't, we can get away with only rasterizing the *new* lines onto the
|
// ...if we don't, we can get away with only rasterizing the *new* lines onto the
|
||||||
// existing texture.
|
// existing texture.
|
||||||
for [from, to] in std::mem::take(&mut self.unblitted_lines) {
|
for [from, to] in std::mem::take(&mut self.e.unblitted_lines) {
|
||||||
self.draw_line_to_texture(from, to, &new_context, ui);
|
self.draw_line_to_texture(from, to, &new_context);
|
||||||
}
|
}
|
||||||
self.unblitted_lines.clear();
|
self.e.unblitted_lines.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw the texture
|
// Draw the texture
|
||||||
if let Some(texture) = &self.texture {
|
self.e.canvas_rasterizer.show(ui.ctx(), &painter, mesh_rect);
|
||||||
let texture = SizedTexture::new(texture.id(), texture.size_vec2());
|
|
||||||
let shape = RectShape {
|
|
||||||
rect: mesh_rect,
|
|
||||||
corner_radius: CornerRadius::ZERO,
|
|
||||||
fill: Color32::WHITE,
|
|
||||||
stroke: Stroke::NONE,
|
|
||||||
stroke_kind: egui::StrokeKind::Inside,
|
|
||||||
round_to_pixels: None,
|
|
||||||
blur_width: 0.0,
|
|
||||||
brush: Some(Arc::new(Brush {
|
|
||||||
fill_texture_id: texture.id,
|
|
||||||
uv: Rect {
|
|
||||||
min: Pos2::ZERO,
|
|
||||||
max: Pos2::new(1.0, 1.0),
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
};
|
|
||||||
painter.add(shape);
|
|
||||||
}
|
|
||||||
|
|
||||||
response
|
response
|
||||||
}
|
}
|
||||||
|
|
||||||
fn refresh_texture(
|
fn commit_current_line(&mut self, response: &mut HandwritingResponse) {
|
||||||
&mut self,
|
debug_assert!(!self.e.current_stroke.is_empty());
|
||||||
style: &HandwritingStyle,
|
self.strokes.push(mem::take(&mut self.e.current_stroke));
|
||||||
mesh_context: MeshContext,
|
response.changed = true;
|
||||||
ui: &mut Ui,
|
}
|
||||||
) {
|
|
||||||
self.last_mesh_ctx = Some(mesh_context);
|
|
||||||
|
|
||||||
self.refresh_texture = false;
|
/// Tessellate and rasterize the strokes into a new texture.
|
||||||
|
fn refresh_texture(&mut self, style: &HandwritingStyle, mesh_context: MeshContext) {
|
||||||
|
let Ephemeral {
|
||||||
|
current_stroke,
|
||||||
|
tessellator,
|
||||||
|
mesh,
|
||||||
|
refresh_texture,
|
||||||
|
last_mesh_ctx,
|
||||||
|
..
|
||||||
|
} = &mut self.e;
|
||||||
|
// TODO: don't tessellate and rasterize on the GUI thread
|
||||||
|
|
||||||
|
*last_mesh_ctx = Some(mesh_context);
|
||||||
|
|
||||||
|
*refresh_texture = false;
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
let start_time = std::time::Instant::now();
|
let start_time = std::time::Instant::now();
|
||||||
|
|
||||||
let mut tesselator = Tessellator::new(
|
let mesh = Arc::make_mut(mesh);
|
||||||
mesh_context.pixels_per_point,
|
|
||||||
TESSELATION_OPTIONS,
|
|
||||||
Default::default(), // we don't tesselate fonts
|
|
||||||
vec![],
|
|
||||||
);
|
|
||||||
|
|
||||||
let mesh = Arc::make_mut(&mut self.mesh);
|
|
||||||
mesh.clear();
|
mesh.clear();
|
||||||
|
|
||||||
|
// TODO: re-use tessellator if pixels_per_point hasn't changed
|
||||||
|
let tessellator = tessellator.insert(new_tessellator(mesh_context.pixels_per_point));
|
||||||
|
|
||||||
self.strokes
|
self.strokes
|
||||||
.iter()
|
.iter()
|
||||||
.chain([&self.current_stroke])
|
.chain([&*current_stroke])
|
||||||
.filter(|stroke| stroke.len() >= 2)
|
.filter(|stroke| stroke.len() >= 2)
|
||||||
.map(|stroke| {
|
.map(|stroke| {
|
||||||
//let points: Vec<Pos2> = stroke.iter().map(|&p| to_screen * p).collect();
|
//let points: Vec<Pos2> = stroke.iter().map(|&p| to_screen * p).collect();
|
||||||
egui::Shape::line(stroke.clone(), style.stroke)
|
egui::Shape::line(stroke.clone(), style.stroke)
|
||||||
})
|
})
|
||||||
.for_each(|shape| {
|
.for_each(|shape| {
|
||||||
tesselator.tessellate_shape(shape, mesh);
|
tessellator.tessellate_shape(shape, mesh);
|
||||||
});
|
});
|
||||||
|
|
||||||
// sanity-check that tesselation did not produce any NaNs.
|
// sanity-check that tessellation did not produce any NaNs.
|
||||||
// this can happen if the line contains duplicated consecutive positions
|
// this can happen if the line contains duplicated consecutive positions
|
||||||
//for vertex in &mesh.vertices {
|
//for vertex in &mesh.vertices {
|
||||||
// debug_assert!(vertex.pos.x.is_finite(), "{} must be finite", vertex.pos.x);
|
// debug_assert!(vertex.pos.x.is_finite(), "{} must be finite", vertex.pos.x);
|
||||||
// debug_assert!(vertex.pos.y.is_finite(), "{} must be finite", vertex.pos.y);
|
// debug_assert!(vertex.pos.y.is_finite(), "{} must be finite", vertex.pos.y);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
let texture = texture!(self, ui, &mesh_context);
|
|
||||||
let triangles = mesh_triangles(&self.mesh);
|
|
||||||
|
|
||||||
let [px_x, px_y] = mesh_context.pixel_size();
|
|
||||||
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
||||||
self.image = rasterize::<StrokeBlendMode>(px_x, px_y, point_to_pixel, triangles);
|
let triangles = mesh_triangles(&self.e.mesh);
|
||||||
texture.set(self.image.clone(), Default::default());
|
|
||||||
|
self.e.canvas_rasterizer.clear();
|
||||||
|
self.e
|
||||||
|
.canvas_rasterizer
|
||||||
|
.rasterize(point_to_pixel, triangles);
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
{
|
{
|
||||||
let elapsed = start_time.elapsed();
|
let elapsed = start_time.elapsed();
|
||||||
println!("refreshed mesh in {:.3}s", elapsed.as_secs_f32());
|
log::debug!("refreshed mesh in {:.3}s", elapsed.as_secs_f32());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -529,46 +486,46 @@ impl Handwriting {
|
|||||||
response
|
response
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Append a new [Pos2] to [Self::current_stroke].
|
||||||
|
///
|
||||||
|
/// Queue a new line to be drawn onto [Self::texture].
|
||||||
fn push_to_stroke(&mut self, new_canvas_pos: Pos2) {
|
fn push_to_stroke(&mut self, new_canvas_pos: Pos2) {
|
||||||
if let Some(&last_canvas_pos) = self.current_stroke.last() {
|
if let Some(&last_canvas_pos) = self.e.current_stroke.last() {
|
||||||
if last_canvas_pos == new_canvas_pos {
|
if last_canvas_pos == new_canvas_pos {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.unblitted_lines.push([last_canvas_pos, new_canvas_pos]);
|
self.e
|
||||||
|
.unblitted_lines
|
||||||
|
.push([last_canvas_pos, new_canvas_pos]);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.current_stroke.push(new_canvas_pos);
|
self.e.current_stroke.push(new_canvas_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Draw a single line onto the existing texture.
|
/// Draw a single line onto the existing texture.
|
||||||
fn draw_line_to_texture(
|
fn draw_line_to_texture(&mut self, from: Pos2, to: Pos2, mesh_context: &MeshContext) {
|
||||||
&mut self,
|
// INVARIANT: if this function was called, then pixels_per_point is the same as last frame,
|
||||||
from: Pos2,
|
// so there's no need to create a new tessellator.
|
||||||
to: Pos2,
|
let tessellator = self
|
||||||
mesh_context: &MeshContext,
|
.e
|
||||||
ui: &mut Ui,
|
.tessellator
|
||||||
) {
|
.get_or_insert_with(|| new_tessellator(mesh_context.pixels_per_point));
|
||||||
let mut tesselator = Tessellator::new(
|
|
||||||
mesh_context.pixels_per_point,
|
|
||||||
TESSELATION_OPTIONS,
|
|
||||||
Default::default(), // we don't tesselate fonts
|
|
||||||
vec![],
|
|
||||||
);
|
|
||||||
|
|
||||||
let mut mesh = Mesh::default();
|
let mut mesh = Mesh::default();
|
||||||
let line = egui::Shape::line_segment([from, to], mesh_context.stroke);
|
let line = egui::Shape::line_segment([from, to], mesh_context.stroke);
|
||||||
tesselator.tessellate_shape(line, &mut mesh);
|
tessellator.tessellate_shape(line, &mut mesh);
|
||||||
|
|
||||||
self.draw_mesh_to_texture(&mesh, mesh_context, ui);
|
self.draw_mesh_to_texture(&mesh, mesh_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Draw a single mesh onto the existing texture.
|
/// Draw a single mesh onto the existing texture.
|
||||||
fn draw_mesh_to_texture(&mut self, mesh: &Mesh, mesh_context: &MeshContext, ui: &mut Ui) {
|
fn draw_mesh_to_texture(&mut self, mesh: &Mesh, mesh_context: &MeshContext) {
|
||||||
let triangles = mesh_triangles(mesh);
|
let triangles = mesh_triangles(mesh);
|
||||||
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
let point_to_pixel = TSTransform::from_scaling(mesh_context.pixels_per_point);
|
||||||
rasterize_onto::<StrokeBlendMode>(&mut self.image, point_to_pixel, triangles);
|
self.e
|
||||||
texture!(self, ui, mesh_context).set(self.image.clone(), Default::default());
|
.canvas_rasterizer
|
||||||
|
.rasterize(point_to_pixel, triangles);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn strokes(&self) -> &[Vec<Pos2>] {
|
pub fn strokes(&self) -> &[Vec<Pos2>] {
|
||||||
@ -627,6 +584,15 @@ impl Handwriting {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn new_tessellator(pixels_per_point: f32) -> Tessellator {
|
||||||
|
Tessellator::new(
|
||||||
|
pixels_per_point,
|
||||||
|
TESSELLATION_OPTIONS,
|
||||||
|
Default::default(), // we don't tessellate fonts
|
||||||
|
vec![],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
impl Display for Handwriting {
|
impl Display for Handwriting {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
let raw = self.encode_as_disk_format();
|
let raw = self.encode_as_disk_format();
|
||||||
@ -646,6 +612,7 @@ impl FromStr for Handwriting {
|
|||||||
.wrap_err("Failed to decode painting data from base64")?;
|
.wrap_err("Failed to decode painting data from base64")?;
|
||||||
|
|
||||||
// HACK: first iteration of disk format did not have version header
|
// HACK: first iteration of disk format did not have version header
|
||||||
|
//let mut bytes = bytes;
|
||||||
//bytes.insert(0, 0);
|
//bytes.insert(0, 0);
|
||||||
//bytes.insert(0, 1);
|
//bytes.insert(0, 1);
|
||||||
|
|
||||||
@ -740,16 +707,19 @@ impl HandwritingStyle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
HandwritingStyle {
|
HandwritingStyle {
|
||||||
stroke: Stroke::new(1.6, stroke_color),
|
stroke: Stroke::new(1.0, stroke_color),
|
||||||
bg_color,
|
bg_color,
|
||||||
bg_line_stroke: Stroke::new(0.5, line_color),
|
bg_line_stroke: Stroke::new(0.5, line_color),
|
||||||
animate: true,
|
animate: true,
|
||||||
|
hide_cursor: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn mesh_triangles(mesh: &Mesh) -> impl Iterator<Item = [&Vertex; 3]> {
|
fn mesh_triangles(mesh: &Mesh) -> impl Iterator<Item = [&Vertex; 3]> + Clone {
|
||||||
mesh.triangles()
|
mesh.indices
|
||||||
|
.chunks_exact(3)
|
||||||
|
.map(|chunk| [chunk[0], chunk[1], chunk[2]])
|
||||||
.map(|indices| indices.map(|i| &mesh.vertices[i as usize]))
|
.map(|indices| indices.map(|i| &mesh.vertices[i as usize]))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,19 @@
|
|||||||
|
---
|
||||||
|
source: src/handwriting/mod.rs
|
||||||
|
expression: deserialized.strokes
|
||||||
|
---
|
||||||
|
[
|
||||||
|
[
|
||||||
|
[-1.0 1.0],
|
||||||
|
[3.0 1.0],
|
||||||
|
[3.0 3.0],
|
||||||
|
[1.5 2.0],
|
||||||
|
[0.0 0.0],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[3.0 3.0],
|
||||||
|
[-1.0 1.0],
|
||||||
|
[0.0 0.0],
|
||||||
|
[3.0 1.0],
|
||||||
|
],
|
||||||
|
]
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
---
|
||||||
|
source: src/handwriting/mod.rs
|
||||||
|
expression: handwriting.strokes
|
||||||
|
---
|
||||||
|
[
|
||||||
|
[
|
||||||
|
[-1.0 1.0],
|
||||||
|
[3.0 1.0],
|
||||||
|
[3.0 3.0],
|
||||||
|
[1.5 2.0],
|
||||||
|
[0.0 0.0],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[3.0 3.0],
|
||||||
|
[-1.0 1.0],
|
||||||
|
[0.0 0.0],
|
||||||
|
[3.0 1.0],
|
||||||
|
],
|
||||||
|
]
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
source: src/handwriting/mod.rs
|
||||||
|
expression: serialized
|
||||||
|
---
|
||||||
|
```handwriting
|
||||||
|
AQAFAAC8ADwAQgA8AEIAQgA+AEAAAAAABAAAQgBCALwAPAAAAAAAQgA8
|
||||||
|
```
|
||||||
@ -3,9 +3,10 @@
|
|||||||
pub mod app;
|
pub mod app;
|
||||||
pub mod constants;
|
pub mod constants;
|
||||||
pub mod custom_code_block;
|
pub mod custom_code_block;
|
||||||
pub mod easy_mark;
|
|
||||||
pub mod file_editor;
|
pub mod file_editor;
|
||||||
|
pub mod folder;
|
||||||
pub mod handwriting;
|
pub mod handwriting;
|
||||||
|
pub mod markdown;
|
||||||
pub mod preferences;
|
pub mod preferences;
|
||||||
pub mod rasterizer;
|
pub mod rasterizer;
|
||||||
pub mod text_editor;
|
pub mod text_editor;
|
||||||
|
|||||||
54
src/markdown/ast.rs
Normal file
54
src/markdown/ast.rs
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
use super::span::Span;
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
||||||
|
pub enum Heading {
|
||||||
|
H1,
|
||||||
|
H2,
|
||||||
|
H3,
|
||||||
|
H4,
|
||||||
|
H5,
|
||||||
|
H6,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
||||||
|
pub struct Style {
|
||||||
|
/// # heading (large text)
|
||||||
|
pub heading: Option<Heading>,
|
||||||
|
|
||||||
|
/// > quoted (slightly dimmer color or other font style)
|
||||||
|
pub quoted: bool,
|
||||||
|
|
||||||
|
/// `code` (monospace, some other color)
|
||||||
|
pub code: bool,
|
||||||
|
|
||||||
|
/// self.strong* (emphasized, e.g. bold)
|
||||||
|
pub strong: bool,
|
||||||
|
|
||||||
|
/// _underline_
|
||||||
|
pub underline: bool,
|
||||||
|
|
||||||
|
/// ~strikethrough~
|
||||||
|
pub strikethrough: bool,
|
||||||
|
|
||||||
|
/// /italics/
|
||||||
|
pub italics: bool,
|
||||||
|
|
||||||
|
/// $small$
|
||||||
|
pub small: bool,
|
||||||
|
|
||||||
|
/// ^raised^
|
||||||
|
pub raised: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum Item<'a> {
|
||||||
|
Text {
|
||||||
|
span: Span<'a>,
|
||||||
|
style: Style,
|
||||||
|
},
|
||||||
|
|
||||||
|
CodeBlock {
|
||||||
|
all: Span<'a>,
|
||||||
|
language: Span<'a>,
|
||||||
|
code: Span<'a>,
|
||||||
|
},
|
||||||
|
}
|
||||||
10
src/markdown/grammar.lalrpop
Normal file
10
src/markdown/grammar.lalrpop
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
use std::str::FromStr;
|
||||||
|
|
||||||
|
grammar;
|
||||||
|
|
||||||
|
pub Term: i32 = {
|
||||||
|
<n:Num> => n,
|
||||||
|
"(" <t:Term> ")" => t,
|
||||||
|
};
|
||||||
|
|
||||||
|
Num: i32 = <s:r"[0-9]+"> => i32::from_str(s).unwrap();
|
||||||
118
src/markdown/highlighter.rs
Normal file
118
src/markdown/highlighter.rs
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
use egui::text::{CCursorRange, LayoutJob};
|
||||||
|
|
||||||
|
use super::{Item, Style, parse};
|
||||||
|
|
||||||
|
/// Highlight markdown, caching previous output to save CPU.
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct MemoizedHighlighter {
|
||||||
|
style: egui::Style,
|
||||||
|
code: String,
|
||||||
|
output: LayoutJob,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MemoizedHighlighter {
|
||||||
|
pub fn highlight(
|
||||||
|
&mut self,
|
||||||
|
egui_style: &egui::Style,
|
||||||
|
code: &str,
|
||||||
|
cursor: Option<CCursorRange>,
|
||||||
|
) -> LayoutJob {
|
||||||
|
if (&self.style, self.code.as_str()) != (egui_style, code) {
|
||||||
|
self.style = egui_style.clone();
|
||||||
|
code.clone_into(&mut self.code);
|
||||||
|
self.output = highlight_markdown(egui_style, code, cursor);
|
||||||
|
}
|
||||||
|
self.output.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn highlight_markdown(
|
||||||
|
egui_style: &egui::Style,
|
||||||
|
text: &str,
|
||||||
|
|
||||||
|
// TODO: hide special characters where cursor isn't
|
||||||
|
_cursor: Option<CCursorRange>,
|
||||||
|
) -> LayoutJob {
|
||||||
|
let mut job = LayoutJob::default();
|
||||||
|
|
||||||
|
let code_style = Style {
|
||||||
|
code: true,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
for item in parse(text) {
|
||||||
|
match item {
|
||||||
|
Item::Text { span, style } => {
|
||||||
|
job.append(&span, 0.0, format_from_style(egui_style, &style));
|
||||||
|
}
|
||||||
|
Item::CodeBlock {
|
||||||
|
all,
|
||||||
|
language: _, // TODO
|
||||||
|
code: _, // TODO
|
||||||
|
} => {
|
||||||
|
job.append(&all, 100.0, format_from_style(egui_style, &code_style));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
job
|
||||||
|
}
|
||||||
|
|
||||||
|
fn format_from_style(egui_style: &egui::Style, style: &Style) -> egui::text::TextFormat {
|
||||||
|
use egui::{Align, Color32, Stroke, TextStyle};
|
||||||
|
|
||||||
|
let color = if style.code {
|
||||||
|
egui_style.visuals.strong_text_color() * Color32::GREEN
|
||||||
|
} else if style.strong || style.heading.is_some() {
|
||||||
|
egui_style.visuals.strong_text_color()
|
||||||
|
} else if style.quoted {
|
||||||
|
egui_style.visuals.weak_text_color()
|
||||||
|
} else {
|
||||||
|
egui_style.visuals.text_color()
|
||||||
|
};
|
||||||
|
|
||||||
|
let text_style = if style.heading.is_some() {
|
||||||
|
TextStyle::Heading
|
||||||
|
} else if style.code {
|
||||||
|
TextStyle::Monospace
|
||||||
|
} else if style.small | style.raised {
|
||||||
|
TextStyle::Small
|
||||||
|
} else {
|
||||||
|
TextStyle::Body
|
||||||
|
};
|
||||||
|
|
||||||
|
let background = if style.code {
|
||||||
|
egui_style.visuals.code_bg_color
|
||||||
|
} else {
|
||||||
|
Color32::TRANSPARENT
|
||||||
|
};
|
||||||
|
|
||||||
|
let underline = if style.underline {
|
||||||
|
Stroke::new(1.0, color)
|
||||||
|
} else {
|
||||||
|
Stroke::NONE
|
||||||
|
};
|
||||||
|
|
||||||
|
let strikethrough = if style.strikethrough {
|
||||||
|
Stroke::new(1.0, color)
|
||||||
|
} else {
|
||||||
|
Stroke::NONE
|
||||||
|
};
|
||||||
|
|
||||||
|
let valign = if style.raised {
|
||||||
|
Align::TOP
|
||||||
|
} else {
|
||||||
|
Align::BOTTOM
|
||||||
|
};
|
||||||
|
|
||||||
|
egui::text::TextFormat {
|
||||||
|
font_id: text_style.resolve(egui_style),
|
||||||
|
color,
|
||||||
|
background,
|
||||||
|
italics: style.italics,
|
||||||
|
underline,
|
||||||
|
strikethrough,
|
||||||
|
valign,
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
}
|
||||||
11
src/markdown/mod.rs
Normal file
11
src/markdown/mod.rs
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
mod ast;
|
||||||
|
mod highlighter;
|
||||||
|
mod parser;
|
||||||
|
mod span;
|
||||||
|
mod tokenizer;
|
||||||
|
|
||||||
|
pub use ast::*;
|
||||||
|
pub use highlighter::*;
|
||||||
|
pub use parser::*;
|
||||||
|
pub use span::*;
|
||||||
|
pub use tokenizer::*;
|
||||||
172
src/markdown/parser.rs
Normal file
172
src/markdown/parser.rs
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
use std::iter::{self, once};
|
||||||
|
|
||||||
|
use crate::markdown::Style;
|
||||||
|
|
||||||
|
use super::{Item, Span, Token, TokenKind, tokenize};
|
||||||
|
|
||||||
|
pub fn parse(text: &str) -> Vec<Item<'_>> {
|
||||||
|
let tokens: Vec<_> = tokenize(text).collect();
|
||||||
|
parse_tokens(&tokens)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn parse_tokens<'a>(mut tokens: &[Token<'a>]) -> Vec<Item<'a>> {
|
||||||
|
// pretend that the first token was preceeded by a newline.
|
||||||
|
// means we don't have to handle the first token as a special case.
|
||||||
|
let mut prev = TokenKind::Newline;
|
||||||
|
|
||||||
|
let mut style = Style::default();
|
||||||
|
|
||||||
|
let mono_style = Style {
|
||||||
|
code: true,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
iter::from_fn(move || {
|
||||||
|
if tokens.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let token = tokens.first().unwrap();
|
||||||
|
tokens = &tokens[1..];
|
||||||
|
|
||||||
|
let start_of_line = prev == TokenKind::Newline;
|
||||||
|
prev = token.kind;
|
||||||
|
|
||||||
|
let mut basic_style: Option<fn(&mut Style) -> &mut bool> = None;
|
||||||
|
|
||||||
|
match token.kind {
|
||||||
|
TokenKind::CodeBlock if start_of_line => {
|
||||||
|
let language = collect_until(
|
||||||
|
None,
|
||||||
|
&mut tokens,
|
||||||
|
any_of([TokenKind::Newline]),
|
||||||
|
);
|
||||||
|
|
||||||
|
let code = collect_until(
|
||||||
|
None,
|
||||||
|
&mut tokens,
|
||||||
|
series([TokenKind::Newline, TokenKind::CodeBlock]),
|
||||||
|
);
|
||||||
|
|
||||||
|
let all = [
|
||||||
|
&token.span,
|
||||||
|
&language,
|
||||||
|
&code,
|
||||||
|
].into_iter().fold(Span::empty(), |a, b| a.try_merge(b).unwrap());
|
||||||
|
|
||||||
|
let language = language.trim_end_matches("\n");
|
||||||
|
let code = code.trim_end_matches("\n```");
|
||||||
|
|
||||||
|
return Some(Item::CodeBlock { all, language, code });
|
||||||
|
}
|
||||||
|
|
||||||
|
TokenKind::Newline => style = Style::default(),
|
||||||
|
|
||||||
|
TokenKind::Strong => basic_style = Some(|s| &mut s.strong),
|
||||||
|
TokenKind::Italic => basic_style = Some(|s| &mut s.italics),
|
||||||
|
TokenKind::Strikethrough => basic_style = Some(|s| &mut s.strikethrough),
|
||||||
|
|
||||||
|
TokenKind::CodeBlock | TokenKind::Mono => {
|
||||||
|
let span = collect_until(
|
||||||
|
Some(token),
|
||||||
|
&mut tokens,
|
||||||
|
any_of([TokenKind::Mono, TokenKind::CodeBlock, TokenKind::Newline]),
|
||||||
|
);
|
||||||
|
|
||||||
|
return Some(Item::Text { span, style: mono_style});
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: different heading strengths
|
||||||
|
TokenKind::Heading(h) if start_of_line => style.heading = Some(h),
|
||||||
|
TokenKind::Quote if start_of_line => style.quoted = true,
|
||||||
|
|
||||||
|
// TODO: replace dashes with dots
|
||||||
|
//// TODO: indented list entries
|
||||||
|
//TokenKind::ListEntry if start_of_line => {
|
||||||
|
// job.append("• ", 0.0, format_from_style(egui_style, &style));
|
||||||
|
// continue;
|
||||||
|
//}
|
||||||
|
|
||||||
|
TokenKind::Text
|
||||||
|
// the following tokens are only richly rendered if encountered e.g. at start_of_line.
|
||||||
|
| TokenKind::Indentation
|
||||||
|
| TokenKind::ListEntry
|
||||||
|
| TokenKind::Heading(..)
|
||||||
|
| TokenKind::Quote => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// if we encountered a marker for Bold, Italic, or Strikethrough, toggle that style and
|
||||||
|
// render the token with the style enabled.
|
||||||
|
if let Some(basic_style) = basic_style {
|
||||||
|
let mut tmp_style = style;
|
||||||
|
*basic_style(&mut tmp_style) = true;
|
||||||
|
*basic_style(&mut style) ^= true; // toggle
|
||||||
|
return Some(Item::Text {
|
||||||
|
span: token.span.clone(),
|
||||||
|
style: tmp_style,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(Item::Text {
|
||||||
|
span: token.span.clone(),
|
||||||
|
style,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn series<'a, const N: usize>(of: [TokenKind; N]) -> impl FnMut(&[Token<'a>; N]) -> bool {
|
||||||
|
move |token| {
|
||||||
|
of.iter()
|
||||||
|
.zip(token)
|
||||||
|
.all(|(kind, token)| kind == &token.kind)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn any_of<'a, const N: usize>(these: [TokenKind; N]) -> impl FnMut(&[Token<'a>; 1]) -> bool {
|
||||||
|
move |[token]| these.contains(&token.kind)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Collect all tokens up to and including `pattern`, and merge them into a signle span.
|
||||||
|
///
|
||||||
|
/// `N` determines how many specific and consecutive tokens we are looking for.
|
||||||
|
/// i.e. if we were looking for a [TokenKind::Newline] followed by a [TokenKind::Quote], `N`
|
||||||
|
/// would equal `2`.
|
||||||
|
///
|
||||||
|
/// `pattern` is a function that accepts an array of `N` tokens and returns `true` if they match,
|
||||||
|
/// i.e. if we should stop collecting. [any_of] and [series] can help to construct this function.
|
||||||
|
///
|
||||||
|
/// The collected tokens will be split off the head of the slice referred to by `tokens`.
|
||||||
|
///
|
||||||
|
/// # Panic
|
||||||
|
/// Panics if `tokens` does not contain only consecutive adjacent spans.
|
||||||
|
fn collect_until<'a, const N: usize>(
|
||||||
|
first_token: Option<&Token<'a>>,
|
||||||
|
tokens: &mut &[Token<'a>],
|
||||||
|
pattern: impl FnMut(&[Token<'a>; N]) -> bool,
|
||||||
|
) -> Span<'a>
|
||||||
|
where
|
||||||
|
// &[T; N]: TryFrom<&[T]>
|
||||||
|
for<'b> &'b [Token<'a>; N]: TryFrom<&'b [Token<'a>]>,
|
||||||
|
{
|
||||||
|
let mut windows = tokens.windows(N).map(|slice| {
|
||||||
|
<&[Token<'a>; N]>::try_from(slice)
|
||||||
|
.ok()
|
||||||
|
.expect("`windows` promises to return slices of length N")
|
||||||
|
});
|
||||||
|
|
||||||
|
let split_at = match windows.position(pattern) {
|
||||||
|
Some(i) => i + N,
|
||||||
|
None => tokens.len(), // consume everything
|
||||||
|
};
|
||||||
|
|
||||||
|
let (consume, keep) = tokens.split_at(split_at);
|
||||||
|
*tokens = keep;
|
||||||
|
|
||||||
|
once(first_token)
|
||||||
|
.flatten()
|
||||||
|
.chain(consume)
|
||||||
|
.fold(Span::empty(), |span: Span<'_>, token| {
|
||||||
|
span.try_merge(&token.span).unwrap()
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
---
|
||||||
|
source: src/markdown/tokenizer.rs
|
||||||
|
expression: examples
|
||||||
|
---
|
||||||
|
- string: "just some normal text :D"
|
||||||
|
tokens:
|
||||||
|
- "Token { span: Span(0..24, \"just some normal text :D\"), kind: Text }"
|
||||||
|
- string: normal *bold* normal
|
||||||
|
tokens:
|
||||||
|
- "Token { span: Span(0..7, \"normal \"), kind: Text }"
|
||||||
|
- "Token { span: Span(7..8, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(8..12, \"bold\"), kind: Text }"
|
||||||
|
- "Token { span: Span(12..13, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(13..20, \" normal\"), kind: Text }"
|
||||||
|
- string: normal * maybe bold? * normal
|
||||||
|
tokens:
|
||||||
|
- "Token { span: Span(0..7, \"normal \"), kind: Text }"
|
||||||
|
- "Token { span: Span(7..8, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(8..21, \" maybe bold? \"), kind: Text }"
|
||||||
|
- "Token { span: Span(21..22, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(22..29, \" normal\"), kind: Text }"
|
||||||
|
- string: "```lang\ncode code code\n```"
|
||||||
|
tokens:
|
||||||
|
- "Token { span: Span(0..3, \"```\"), kind: CodeBlock }"
|
||||||
|
- "Token { span: Span(3..7, \"lang\"), kind: Text }"
|
||||||
|
- "Token { span: Span(7..8, \"\\n\"), kind: Newline }"
|
||||||
|
- "Token { span: Span(8..22, \"code code code\"), kind: Text }"
|
||||||
|
- "Token { span: Span(22..23, \"\\n\"), kind: Newline }"
|
||||||
|
- "Token { span: Span(23..26, \"```\"), kind: CodeBlock }"
|
||||||
|
- string: "*_``_*"
|
||||||
|
tokens:
|
||||||
|
- "Token { span: Span(0..1, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(1..2, \"_\"), kind: Italic }"
|
||||||
|
- "Token { span: Span(2..3, \"`\"), kind: Mono }"
|
||||||
|
- "Token { span: Span(3..4, \"`\"), kind: Mono }"
|
||||||
|
- "Token { span: Span(4..5, \"_\"), kind: Italic }"
|
||||||
|
- "Token { span: Span(5..6, \"*\"), kind: Strong }"
|
||||||
|
- string: "*_`*_*_"
|
||||||
|
tokens:
|
||||||
|
- "Token { span: Span(0..1, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(1..2, \"_\"), kind: Italic }"
|
||||||
|
- "Token { span: Span(2..3, \"`\"), kind: Mono }"
|
||||||
|
- "Token { span: Span(3..4, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(4..5, \"_\"), kind: Italic }"
|
||||||
|
- "Token { span: Span(5..6, \"*\"), kind: Strong }"
|
||||||
|
- "Token { span: Span(6..7, \"_\"), kind: Italic }"
|
||||||
115
src/markdown/span.rs
Normal file
115
src/markdown/span.rs
Normal file
@ -0,0 +1,115 @@
|
|||||||
|
use std::{
|
||||||
|
fmt,
|
||||||
|
ops::{Deref, Range},
|
||||||
|
};
|
||||||
|
|
||||||
|
use eyre::{bail, eyre};
|
||||||
|
|
||||||
|
#[derive(Clone, Eq, PartialEq)]
|
||||||
|
pub struct Span<'a> {
|
||||||
|
complete_str: &'a str,
|
||||||
|
range: Range<usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Span<'a> {
|
||||||
|
pub fn new(complete_str: &'a str) -> Self {
|
||||||
|
Self {
|
||||||
|
complete_str,
|
||||||
|
range: 0..complete_str.len(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const fn empty() -> Self {
|
||||||
|
Span {
|
||||||
|
complete_str: "",
|
||||||
|
range: 0..0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(&self, slice: Range<usize>) -> Option<Self> {
|
||||||
|
let start = self.range.start.checked_add(slice.start)?;
|
||||||
|
let end = self.range.start.checked_add(slice.end)?;
|
||||||
|
|
||||||
|
if end > self.range.end || end < start {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(Self {
|
||||||
|
complete_str: self.complete_str,
|
||||||
|
range: Range { start, end },
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn complete_str(&self) -> Self {
|
||||||
|
Self::new(self.complete_str)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn split_at(&self, i: usize) -> Option<(Self, Self)> {
|
||||||
|
let head = self.get(0..i)?;
|
||||||
|
let tail = self.get(i..self.range.len())?;
|
||||||
|
Some((head, tail))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn trim_end_matches(&self, p: &str) -> Self {
|
||||||
|
if !self.ends_with(p) {
|
||||||
|
return self.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
Self {
|
||||||
|
range: self.range.start..self.range.end - p.len(),
|
||||||
|
complete_str: self.complete_str,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Try to merge the spans.
|
||||||
|
///
|
||||||
|
/// If either spans is empty, this just returns the other one.
|
||||||
|
/// This only works if spans are pointing into the same backing buffer, and are adjacent.
|
||||||
|
pub fn try_merge(&self, other: &Self) -> eyre::Result<Self> {
|
||||||
|
if self.is_empty() {
|
||||||
|
return Ok(other.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
if other.is_empty() {
|
||||||
|
return Ok(self.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.complete_str.as_ptr() != other.complete_str.as_ptr() {
|
||||||
|
bail!("Can't merge different strings");
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.range.end == other.range.start {
|
||||||
|
Ok(Self {
|
||||||
|
range: self.range.start..other.range.end,
|
||||||
|
..*self
|
||||||
|
})
|
||||||
|
} else if self.range.start == other.range.end {
|
||||||
|
Ok(Self {
|
||||||
|
range: other.range.start..self.range.end,
|
||||||
|
..*self
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
Err(eyre!("String: {:?}", self.complete_str)
|
||||||
|
.wrap_err(eyre!("Span 2: {:?}", other.deref()))
|
||||||
|
.wrap_err(eyre!("Span 1: {:?}", self.deref()))
|
||||||
|
.wrap_err("Can't merge disjoint string spans"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deref for Span<'_> {
|
||||||
|
type Target = str;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.complete_str[self.range.clone()]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> fmt::Debug for Span<'a> {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
f.debug_tuple("Span")
|
||||||
|
.field(&self.range)
|
||||||
|
.field(&self.deref())
|
||||||
|
.finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
146
src/markdown/tokenizer.rs
Normal file
146
src/markdown/tokenizer.rs
Normal file
@ -0,0 +1,146 @@
|
|||||||
|
use std::iter;
|
||||||
|
|
||||||
|
use super::{Heading, span::Span};
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
|
pub enum TokenKind {
|
||||||
|
/// A newline that isn't a codeblock
|
||||||
|
Newline,
|
||||||
|
|
||||||
|
/// "#" to "######"
|
||||||
|
Heading(Heading),
|
||||||
|
|
||||||
|
/// A newline followed by three `
|
||||||
|
CodeBlock,
|
||||||
|
|
||||||
|
Mono,
|
||||||
|
Strong,
|
||||||
|
Italic,
|
||||||
|
Strikethrough,
|
||||||
|
|
||||||
|
/// ">"
|
||||||
|
Quote,
|
||||||
|
|
||||||
|
/// Two spaces
|
||||||
|
Indentation,
|
||||||
|
|
||||||
|
/// "- "
|
||||||
|
ListEntry,
|
||||||
|
|
||||||
|
/// Normal text
|
||||||
|
Text,
|
||||||
|
}
|
||||||
|
|
||||||
|
const TOKENS: &[(&'static str, TokenKind)] = &[
|
||||||
|
("\n", TokenKind::Newline),
|
||||||
|
("######", TokenKind::Heading(Heading::H6)),
|
||||||
|
("#####", TokenKind::Heading(Heading::H5)),
|
||||||
|
("####", TokenKind::Heading(Heading::H4)),
|
||||||
|
("###", TokenKind::Heading(Heading::H3)),
|
||||||
|
("##", TokenKind::Heading(Heading::H2)),
|
||||||
|
("#", TokenKind::Heading(Heading::H1)),
|
||||||
|
("```", TokenKind::CodeBlock),
|
||||||
|
("`", TokenKind::Mono),
|
||||||
|
("*", TokenKind::Strong),
|
||||||
|
("_", TokenKind::Italic),
|
||||||
|
("~", TokenKind::Strikethrough),
|
||||||
|
(">", TokenKind::Quote),
|
||||||
|
(" ", TokenKind::Indentation),
|
||||||
|
("- ", TokenKind::ListEntry),
|
||||||
|
];
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Token<'a> {
|
||||||
|
pub span: Span<'a>,
|
||||||
|
pub kind: TokenKind,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn tokenize<'a>(s: &'a str) -> impl Iterator<Item = Token<'a>> {
|
||||||
|
let mut s = Span::new(s);
|
||||||
|
let mut yield_n: usize = 0;
|
||||||
|
|
||||||
|
iter::from_fn(move || {
|
||||||
|
loop {
|
||||||
|
if s.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
if yield_n == s.len() {
|
||||||
|
let (token, rest) = s.split_at(s.len()).unwrap();
|
||||||
|
let token = Token {
|
||||||
|
span: token,
|
||||||
|
kind: TokenKind::Text,
|
||||||
|
};
|
||||||
|
s = rest;
|
||||||
|
return Some(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
let token = TOKENS.iter().find_map(|(token_str, token_kind)| {
|
||||||
|
s[yield_n..]
|
||||||
|
.starts_with(token_str)
|
||||||
|
.then(|| (*token_kind, token_str.len()))
|
||||||
|
});
|
||||||
|
|
||||||
|
let Some((kind, len)) = token else {
|
||||||
|
yield_n += s[yield_n..].chars().next().unwrap_or('\0').len_utf8();
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
if yield_n > 0 {
|
||||||
|
let (token, rest) = s.split_at(yield_n).unwrap();
|
||||||
|
let token = Token {
|
||||||
|
span: token,
|
||||||
|
kind: TokenKind::Text,
|
||||||
|
};
|
||||||
|
s = rest;
|
||||||
|
yield_n = 0;
|
||||||
|
return Some(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
let (token, rest) = s.split_at(len).unwrap();
|
||||||
|
let token = Token { span: token, kind };
|
||||||
|
s = rest;
|
||||||
|
return Some(token);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
use super::tokenize;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_tokenize() {
|
||||||
|
let examples = [
|
||||||
|
"just some normal text :D",
|
||||||
|
"normal *bold* normal",
|
||||||
|
"normal * maybe bold? * normal",
|
||||||
|
"```lang\ncode code code\n```",
|
||||||
|
"*_``_*",
|
||||||
|
"*_`*_*_",
|
||||||
|
];
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct Result {
|
||||||
|
pub string: &'static str,
|
||||||
|
|
||||||
|
/// Debug-printed tokens
|
||||||
|
pub tokens: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
let examples = examples
|
||||||
|
.into_iter()
|
||||||
|
.map(|string| {
|
||||||
|
let tokens = tokenize(string)
|
||||||
|
.map(|tokens| format!("{tokens:?}"))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
Result { string, tokens }
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
insta::assert_yaml_snapshot!(examples);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -10,6 +10,9 @@ pub struct Preferences {
|
|||||||
/// Enable high-contrast theme
|
/// Enable high-contrast theme
|
||||||
pub high_contrast: bool,
|
pub high_contrast: bool,
|
||||||
|
|
||||||
|
/// Hide the cursor when handwriting
|
||||||
|
pub hide_handwriting_cursor: bool,
|
||||||
|
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
has_applied_theme: bool,
|
has_applied_theme: bool,
|
||||||
}
|
}
|
||||||
@ -20,6 +23,7 @@ impl Default for Preferences {
|
|||||||
animations: true,
|
animations: true,
|
||||||
high_contrast: false,
|
high_contrast: false,
|
||||||
has_applied_theme: false,
|
has_applied_theme: false,
|
||||||
|
hide_handwriting_cursor: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -30,13 +34,18 @@ impl Preferences {
|
|||||||
if !self.has_applied_theme {
|
if !self.has_applied_theme {
|
||||||
self.has_applied_theme = true;
|
self.has_applied_theme = true;
|
||||||
|
|
||||||
|
let mut dark_visuals = Visuals::dark();
|
||||||
|
let mut light_visuals = Visuals::light();
|
||||||
|
|
||||||
|
dark_visuals.code_bg_color = Color32::BLACK;
|
||||||
|
dark_visuals.code_bg_color = Color32::BLACK;
|
||||||
|
light_visuals.code_bg_color = Color32::WHITE;
|
||||||
|
|
||||||
if self.high_contrast {
|
if self.high_contrast {
|
||||||
// widgets.active: color of headers in textedit
|
// widgets.active: color of headers in textedit
|
||||||
// widgets.inactive: color of button labels
|
// widgets.inactive: color of button labels
|
||||||
// widgets.hovered: color of hovered button labels
|
// widgets.hovered: color of hovered button labels
|
||||||
// widgets.noninteractive: color of labels and normal textedit text
|
// widgets.noninteractive: color of labels and normal textedit text
|
||||||
let mut dark_visuals = Visuals::dark();
|
|
||||||
let mut light_visuals = Visuals::light();
|
|
||||||
|
|
||||||
dark_visuals.widgets.noninteractive.fg_stroke.color = Color32::WHITE;
|
dark_visuals.widgets.noninteractive.fg_stroke.color = Color32::WHITE;
|
||||||
dark_visuals.widgets.inactive.fg_stroke.color = Color32::WHITE;
|
dark_visuals.widgets.inactive.fg_stroke.color = Color32::WHITE;
|
||||||
@ -45,13 +54,16 @@ impl Preferences {
|
|||||||
light_visuals.widgets.noninteractive.fg_stroke.color = Color32::BLACK;
|
light_visuals.widgets.noninteractive.fg_stroke.color = Color32::BLACK;
|
||||||
light_visuals.widgets.inactive.fg_stroke.color = Color32::BLACK;
|
light_visuals.widgets.inactive.fg_stroke.color = Color32::BLACK;
|
||||||
light_visuals.widgets.hovered.fg_stroke.color = Color32::BLACK;
|
light_visuals.widgets.hovered.fg_stroke.color = Color32::BLACK;
|
||||||
|
} else {
|
||||||
|
dark_visuals.widgets.noninteractive.fg_stroke.color =
|
||||||
|
Color32::from_rgb(0xaa, 0xaa, 0xaa);
|
||||||
|
|
||||||
|
light_visuals.widgets.noninteractive.fg_stroke.color =
|
||||||
|
Color32::from_rgb(0x11, 0x11, 0x11);
|
||||||
|
}
|
||||||
|
|
||||||
ctx.set_visuals_of(Theme::Dark, dark_visuals);
|
ctx.set_visuals_of(Theme::Dark, dark_visuals);
|
||||||
ctx.set_visuals_of(Theme::Light, light_visuals);
|
ctx.set_visuals_of(Theme::Light, light_visuals);
|
||||||
} else {
|
|
||||||
ctx.set_visuals_of(Theme::Dark, Visuals::dark());
|
|
||||||
ctx.set_visuals_of(Theme::Light, Visuals::light());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,6 +79,8 @@ impl Preferences {
|
|||||||
self.apply(ui.ctx());
|
self.apply(ui.ctx());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ui.toggle_value(&mut self.hide_handwriting_cursor, "Hide Handwriting Cursor");
|
||||||
|
|
||||||
egui::widgets::global_theme_preference_buttons(ui);
|
egui::widgets::global_theme_preference_buttons(ui);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
use core::f32;
|
use core::f32;
|
||||||
use egui::{Color32, ColorImage, Pos2, Rect, Vec2, emath::TSTransform, epaint::Vertex};
|
use egui::{Color32, ColorImage, Pos2, Rect, Vec2, emath::TSTransform, epaint::Vertex};
|
||||||
|
use std::ops::Range;
|
||||||
|
|
||||||
pub trait BlendFn {
|
pub trait BlendFn {
|
||||||
fn blend(a: Color32, b: Color32) -> Color32;
|
fn blend(a: Color32, b: Color32) -> Color32;
|
||||||
@ -86,9 +87,20 @@ pub fn rasterize_onto<'a, Blend: BlendFn>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Rasterize a single triangles onto an image,
|
||||||
|
///
|
||||||
|
/// Triangle positions must be in image-local point-coords.
|
||||||
|
pub fn rasterize_triangle_onto<'a, Blend: BlendFn>(
|
||||||
|
image: &mut ColorImage,
|
||||||
|
point_to_pixel: TSTransform,
|
||||||
|
triangle: [&'a Vertex; 3],
|
||||||
|
) {
|
||||||
|
rasterize_onto::<Blend>(image, point_to_pixel, [triangle].into_iter());
|
||||||
|
}
|
||||||
|
|
||||||
/// A bounding box, measured in pixels.
|
/// A bounding box, measured in pixels.
|
||||||
#[derive(Debug, PartialEq, Eq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
struct PxBoundingBox {
|
pub struct PxBoundingBox {
|
||||||
pub x_from: usize,
|
pub x_from: usize,
|
||||||
pub y_from: usize,
|
pub y_from: usize,
|
||||||
pub x_to: usize,
|
pub x_to: usize,
|
||||||
@ -104,9 +116,42 @@ impl PxBoundingBox {
|
|||||||
y_to: self.y_to.min(other.y_to),
|
y_to: self.y_to.min(other.y_to),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn union(&self, other: &PxBoundingBox) -> PxBoundingBox {
|
||||||
|
PxBoundingBox {
|
||||||
|
x_from: self.x_from.min(other.x_from),
|
||||||
|
y_from: self.y_from.min(other.y_from),
|
||||||
|
x_to: self.x_to.max(other.x_to),
|
||||||
|
y_to: self.y_to.max(other.y_to),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn x_range(&self) -> Range<usize> {
|
||||||
|
self.x_from..self.x_to
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn y_range(&self) -> Range<usize> {
|
||||||
|
self.y_from..self.y_to
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Test whether two boxes do NOT overlap
|
||||||
|
pub fn overlaps_with(&self, other: &PxBoundingBox) -> bool {
|
||||||
|
!self.is_disjoint_from(other)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_disjoint_from(&self, other: &PxBoundingBox) -> bool {
|
||||||
|
false
|
||||||
|
|| self.x_from > other.x_to
|
||||||
|
|| self.y_from > other.y_to
|
||||||
|
|| other.x_from > self.x_to
|
||||||
|
|| other.y_from > self.y_to
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn triangle_bounding_box(triangle: &[&Vertex; 3], point_to_pixel: TSTransform) -> PxBoundingBox {
|
pub fn triangle_bounding_box(
|
||||||
|
triangle: &[&Vertex; 3],
|
||||||
|
point_to_pixel: TSTransform,
|
||||||
|
) -> PxBoundingBox {
|
||||||
// calculate bounding box in point coords
|
// calculate bounding box in point coords
|
||||||
let mut rect = Rect::NOTHING;
|
let mut rect = Rect::NOTHING;
|
||||||
for vertex in triangle {
|
for vertex in triangle {
|
||||||
@ -165,11 +210,9 @@ fn point_in_triangle(point: Pos2, triangle: [&Vertex; 3]) -> PointInTriangle {
|
|||||||
// Normalize the weights.
|
// Normalize the weights.
|
||||||
let weights = areas.map(|area| area / triangle_area);
|
let weights = areas.map(|area| area / triangle_area);
|
||||||
|
|
||||||
if cfg!(debug_assertions) {
|
if cfg!(debug_assertions) && weights.into_iter().any(f32::is_nan) {
|
||||||
if weights.into_iter().any(f32::is_nan) {
|
|
||||||
panic!("weights must not be NaN! {weights:?} {triangle_area:?} {areas:?} {sides:?}");
|
panic!("weights must not be NaN! {weights:?} {triangle_area:?} {areas:?} {sides:?}");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
PointInTriangle { inside, weights }
|
PointInTriangle { inside, weights }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,43 @@
|
|||||||
|
---
|
||||||
|
source: src/custom_code_block.rs
|
||||||
|
expression: list
|
||||||
|
---
|
||||||
|
[
|
||||||
|
Line(
|
||||||
|
"\n",
|
||||||
|
),
|
||||||
|
Line(
|
||||||
|
"# Hello world\n",
|
||||||
|
),
|
||||||
|
Line(
|
||||||
|
"## Subheader\n",
|
||||||
|
),
|
||||||
|
Line(
|
||||||
|
"- 1\n",
|
||||||
|
),
|
||||||
|
CodeBlock {
|
||||||
|
key: "foo",
|
||||||
|
content: " whatever\n some code\n Hi mom!",
|
||||||
|
span: "```foo\n whatever\n some code\n Hi mom!\n```",
|
||||||
|
},
|
||||||
|
Line(
|
||||||
|
" \n",
|
||||||
|
),
|
||||||
|
Line(
|
||||||
|
"\n",
|
||||||
|
),
|
||||||
|
CodeBlock {
|
||||||
|
key: "` # wrong number of ticks, but that's ok",
|
||||||
|
content: " ``` # indented ticks",
|
||||||
|
span: "```` # wrong number of ticks, but that's ok\n ``` # indented ticks\n```\n",
|
||||||
|
},
|
||||||
|
Line(
|
||||||
|
"\n",
|
||||||
|
),
|
||||||
|
Line(
|
||||||
|
"``` # no closing ticks\n",
|
||||||
|
),
|
||||||
|
Line(
|
||||||
|
" ",
|
||||||
|
),
|
||||||
|
]
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
source: src/painting.rs
|
||||||
|
expression: serialized
|
||||||
|
---
|
||||||
|
```handwriting
|
||||||
|
BQAAvAA8AEIAPABCAEIAPgBAAAAAAAQAAEIAQgC8ADwAAAAAAEIAPA==
|
||||||
|
```
|
||||||
@ -8,7 +8,7 @@ use egui::{
|
|||||||
Color32, InputState, Key, Modifiers, TextBuffer, TextEdit, Ui, Vec2, text::CCursorRange,
|
Color32, InputState, Key, Modifiers, TextBuffer, TextEdit, Ui, Vec2, text::CCursorRange,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::easy_mark::MemoizedHighlighter;
|
use crate::markdown::MemoizedHighlighter;
|
||||||
|
|
||||||
#[derive(Default, serde::Deserialize, serde::Serialize)]
|
#[derive(Default, serde::Deserialize, serde::Serialize)]
|
||||||
pub struct MdTextEdit {
|
pub struct MdTextEdit {
|
||||||
@ -50,8 +50,8 @@ impl MdTextEdit {
|
|||||||
|
|
||||||
let w = ui.available_width();
|
let w = ui.available_width();
|
||||||
|
|
||||||
let mut layouter = |ui: &egui::Ui, easymark: &dyn TextBuffer, _wrap_width: f32| {
|
let mut layouter = |ui: &egui::Ui, markdown: &dyn TextBuffer, _wrap_width: f32| {
|
||||||
let mut layout_job = highlighter.highlight(ui.style(), easymark.as_str(), *cursor);
|
let mut layout_job = highlighter.highlight(ui.style(), markdown.as_str(), *cursor);
|
||||||
layout_job.wrap.max_width = w - 10.0;
|
layout_job.wrap.max_width = w - 10.0;
|
||||||
ui.fonts(|f| f.layout_job(layout_job))
|
ui.fonts(|f| f.layout_job(layout_job))
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user