mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-18 01:22:49 +00:00
egui fork 5493e3aa: kittest's eframe harness runs App::raw_input_hook before every pass
This commit is contained in:
Generated
+14
-14
@@ -2423,7 +2423,7 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"emath",
|
||||
@@ -2432,7 +2432,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "eframe"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -2467,7 +2467,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"ahash",
|
||||
@@ -2486,7 +2486,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui-wgpu"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -2505,7 +2505,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui-winit"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"block2 0.6.2",
|
||||
"bytemuck",
|
||||
@@ -2525,7 +2525,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui_glow"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"egui",
|
||||
@@ -2538,7 +2538,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui_kittest"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"eframe",
|
||||
"egui",
|
||||
@@ -2561,7 +2561,7 @@ checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
@@ -2622,7 +2622,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -2648,7 +2648,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "epaint_default_fonts"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
@@ -9236,19 +9236,19 @@ dependencies = [
|
||||
[[patch.unused]]
|
||||
name = "egui_demo_lib"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
|
||||
[[patch.unused]]
|
||||
name = "egui_extras"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
|
||||
[[patch.unused]]
|
||||
name = "egui_inspection"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
|
||||
[[patch.unused]]
|
||||
name = "egui_system_font_provider"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=3f56db2d932d5ce35ff420f8679896b646be9e77#3f56db2d932d5ce35ff420f8679896b646be9e77"
|
||||
source = "git+https://github.com/aiongg/egui.git?rev=5493e3aab885293f10087d63465543ecdac5482d#5493e3aab885293f10087d63465543ecdac5482d"
|
||||
|
||||
+14
-14
@@ -198,20 +198,20 @@ hayro-jbig2 = { path = "vendor/hayro-jbig2" }
|
||||
hayro-cmap = { path = "vendor/hayro-cmap" }
|
||||
hayro-postscript = { path = "vendor/hayro-postscript" }
|
||||
linesweeper = { path = "vendor/linesweeper" }
|
||||
ecolor = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
emath = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
epaint = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
epaint_default_fonts = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui-winit = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui-wgpu = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui_glow = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui_extras = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui_kittest = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui_system_font_provider = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
eframe = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui_demo_lib = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
egui_inspection = { git = "https://github.com/aiongg/egui.git", rev = "3f56db2d932d5ce35ff420f8679896b646be9e77" }
|
||||
ecolor = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
emath = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
epaint = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
epaint_default_fonts = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui-winit = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui-wgpu = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui_glow = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui_extras = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui_kittest = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui_system_font_provider = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
eframe = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui_demo_lib = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
egui_inspection = { git = "https://github.com/aiongg/egui.git", rev = "5493e3aab885293f10087d63465543ecdac5482d" }
|
||||
winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
|
||||
|
||||
# symphonia's FLAC decoder restores LPC samples as `residual + (prediction as i32)`. In a valid
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/// The egui fork the library is built and tested with. Apps patch egui to exactly this.
|
||||
pub const GIT: &str = "https://github.com/aiongg/egui.git";
|
||||
/// The commit of [`GIT`].
|
||||
pub const REV: &str = "3f56db2d932d5ce35ff420f8679896b646be9e77";
|
||||
pub const REV: &str = "5493e3aab885293f10087d63465543ecdac5482d";
|
||||
|
||||
/// The packages the workspace patches to the fork (the `[patch.crates-io]` entries that name [`GIT`]).
|
||||
pub const PACKAGES: &[&str] = &[
|
||||
|
||||
@@ -338,7 +338,7 @@ Content runs in every pass, and its sizes come from this pass. Layouts also read
|
||||
|
||||
`craft-libs` pins one revision of an egui fork for every egui crate (`[patch.crates-io]` in the root `Cargo.toml`). Two revisions in one build would give two incompatible `Tokens` and `Ui` types. `craft::egui_fork::{GIT, REV}` name the fork and revision, and `craft::egui_fork::check_lockfile` checks that an app's `Cargo.lock` takes every egui package from them; an app's `xtask` calls it. An app must also patch egui to the same fork, because `[patch]` applies only at the workspace root.
|
||||
|
||||
**The fork.** This branch pins `github.com/aiongg/egui` at `3f56db2d`. That revision is the storytold egui fork's pinned revision (`6d518fc7`, the pin on storytold `craft-libs` main) plus 20 commits the framework needs:
|
||||
**The fork.** This branch pins `github.com/aiongg/egui` at `5493e3aa`. That revision is the storytold egui fork's pinned revision (`6d518fc7`, the pin on storytold `craft-libs` main) plus 22 commits the framework needs:
|
||||
|
||||
- `TextEditState::preedit`, and a new IME context ends the old composition
|
||||
- `InteractOptions::enabled` (disable one widget of an enabled `Ui`) and `InteractOptions::activate_on_space`
|
||||
@@ -351,6 +351,7 @@ Content runs in every pass, and its sizes come from this pass. Layouts also read
|
||||
- OpenType features per text section (epaint)
|
||||
- `IdTypeMap::insert_temp_boxed` keeps the allocation of a value taken out, and `Context::ptr_eq`
|
||||
- `Context::pass_mark`, `pass_records_since` and `replay_pass_records`: a settled region replays its last pass's records
|
||||
- `egui_kittest`'s eframe harness runs `App::raw_input_hook` before each pass, as eframe does, so an app's `embed::before_input` runs in its tests
|
||||
|
||||
The fork's `PATCHES.md` describes each patch and whether it is proposed upstream.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user