skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update accesskit to 0.11 (#3012) 

* Update accesskit to 0.11

* Add instructions on how to test the web viewer to CONTRIBUTING.md

Also removed dependency on `jq`

Closes https://github.com/emilk/egui/issues/2859
This commit is contained in:
Emil Ernerfeldt 2023-05-22 19:20:58 +02:00 committed by GitHub
parent d7dcfe4dae
commit b758e9dbf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ARCHITECTURE.md
View File

@ -1,7 +1,7 @@
# Architecture # Architecture
This document describes how the crates that make up egui are all connected. This document describes how the crates that make up egui are all connected.
Also see [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md) for what to do before opening a PR. Also see [`CONTRIBUTING.md`](CONTRIBUTING.md) for what to do before opening a PR.
## Crate overview ## Crate overview

9
CONTRIBUTING.md
View File

@ -27,7 +27,7 @@ If you are filing a bug, please provide a way to reproduce it.
First file an issue (or find an existing one) and announce that you plan to work on something. That way we will avoid having several people doing double work. Please ask for feedback before you start working on something non-trivial! First file an issue (or find an existing one) and announce that you plan to work on something. That way we will avoid having several people doing double work. Please ask for feedback before you start working on something non-trivial!
Browse through [`ARCHITECTURE.md`](https://github.com/emilk/egui/blob/master/ARCHITECTURE.md) to get a sense of how all pieces connects. Browse through [`ARCHITECTURE.md`](ARCHITECTURE.md) to get a sense of how all pieces connects.
You can test your code locally by running `./scripts/check.sh`. You can test your code locally by running `./scripts/check.sh`.
@ -50,6 +50,13 @@ I will add a link to it from the `egui` README.md so others can easily find it.
Read the section on integrations at <https://github.com/emilk/egui#integrations>. Read the section on integrations at <https://github.com/emilk/egui#integrations>.
## Testing the web viewer
* Install some tools with `scripts/setup_web.sh`
* Build with `scripts/build_demo_web.sh`
* Host with `scripts/start_server.sh`
* Open <http://localhost:8888/index.html>
## Code Conventions ## Code Conventions
Conventions unless otherwise specified: Conventions unless otherwise specified:

24
Cargo.lock generated
View File

@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]] [[package]]
name = "accesskit" name = "accesskit"
version = "0.10.1" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" checksum = "02c98a5d094590335462354da402d754fe2cb78f0e6ce5024611c28ed539c1de"
dependencies = [ dependencies = [
"enumn", "enumn",
"serde", "serde",
@ -30,18 +30,18 @@ dependencies = [
[[package]] [[package]]
name = "accesskit_consumer" name = "accesskit_consumer"
version = "0.14.1" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9" checksum = "ca541e0fdb600916d196a940228df99b86d804fd2e6ef13894d7814f2799db43"
dependencies = [ dependencies = [
"accesskit", "accesskit",
] ]
[[package]] [[package]]
name = "accesskit_macos" name = "accesskit_macos"
version = "0.6.2" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9" checksum = "cfea17e5bb5dcbfcf5b256ab2f5889a3e6f6582de78b9db9b6689adad3b002f3"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_consumer", "accesskit_consumer",
@ -51,9 +51,9 @@ dependencies = [
[[package]] [[package]]
name = "accesskit_unix" name = "accesskit_unix"
version = "0.3.2" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f8df4021f31969877b295fa80c4b07fcc7eb83f1985b0d3aa4f889c3427c3d5" checksum = "b4d1517421278cc8e67422d0786a18cf4291093ebe49eadf1cf989ff80e57f90"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_consumer", "accesskit_consumer",
@ -66,9 +66,9 @@ dependencies = [
[[package]] [[package]]
name = "accesskit_windows" name = "accesskit_windows"
version = "0.13.2" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115" checksum = "e11c7f177739f23bd19bb856e4a64fdd96eb8638ec0a6a6dde9a7019a9e91c53"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_consumer", "accesskit_consumer",
@ -80,9 +80,9 @@ dependencies = [
[[package]] [[package]]
name = "accesskit_winit" name = "accesskit_winit"
version = "0.12.4" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31" checksum = "3f741b54fba827e49a73d55fdd43e8d3d5133aa7710a48581013c7802f232b83"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_macos", "accesskit_macos",

2
crates/egui-winit/Cargo.toml
View File

@ -63,7 +63,7 @@ raw-window-handle = "0.5.0"
#! ### Optional dependencies #! ### Optional dependencies
# feature accesskit # feature accesskit
accesskit_winit = { version = "0.12.0", optional = true } accesskit_winit = { version = "0.14.0", optional = true }
## Enable this when generating docs. ## Enable this when generating docs.
document-features = { version = "0.2", optional = true } document-features = { version = "0.2", optional = true }

2
crates/egui/Cargo.toml
View File

@ -73,7 +73,7 @@ nohash-hasher = "0.2"
#! ### Optional dependencies #! ### Optional dependencies
## Exposes detailed accessibility implementation required by platform ## Exposes detailed accessibility implementation required by platform
## accessibility APIs. Also requires support in the egui integration. ## accessibility APIs. Also requires support in the egui integration.
accesskit = { version = "0.10.1", optional = true } accesskit = { version = "0.11", optional = true }
## Enable this when generating docs. ## Enable this when generating docs.
document-features = { version = "0.2", optional = true } document-features = { version = "0.2", optional = true }

3
scripts/build_demo_web.sh
View File

@ -85,7 +85,8 @@ echo "Building rust…"
) )
# Get the output directory (in the workspace it is in another location) # Get the output directory (in the workspace it is in another location)
TARGET=`cargo metadata --format-version=1 | jq --raw-output .target_directory` # TARGET=`cargo metadata --format-version=1 | jq --raw-output .target_directory`
TARGET="target"
echo "Generating JS bindings for wasm…" echo "Generating JS bindings for wasm…"
TARGET_NAME="${CRATE_NAME}.wasm" TARGET_NAME="${CRATE_NAME}.wasm"

4
scripts/start_server.sh
View File

@ -14,5 +14,5 @@ cargo install basic-http-server
echo "starting server…" echo "starting server…"
echo "serving at http://localhost:${PORT}" echo "serving at http://localhost:${PORT}"
(cd docs && basic-http-server --addr 127.0.0.1:${PORT} .) (cd docs && basic-http-server --addr 0.0.0.0:${PORT} .)
# (cd docs && python3 -m http.server ${PORT} --bind 127.0.0.1) # (cd docs && python3 -m http.server ${PORT} --bind 0.0.0.0)