From 233be476595a74902020f22a3d83376e4b5808a0 Mon Sep 17 00:00:00 2001 From: kernelkind Date: Sun, 27 Jul 2025 12:29:08 -0400 Subject: [PATCH] TMP: update egui for better TextInputState handling Signed-off-by: kernelkind --- Cargo.lock | 33 ++++++++++++++++++++------------- Cargo.toml | 12 ++++++------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d87574f..4eaf56d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1392,17 +1392,17 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" [[package]] name = "ecolor" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "bytemuck", - "emath 0.31.1 (git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc)", + "emath 0.31.1 (git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd)", "serde", ] [[package]] name = "eframe" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "ahash", "bytemuck", @@ -1438,24 +1438,25 @@ dependencies = [ [[package]] name = "egui" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "accesskit", "ahash", "backtrace", "bitflags 2.9.1", - "emath 0.31.1 (git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc)", + "emath 0.31.1 (git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd)", "epaint", "log", "nohash-hasher", "profiling", "serde", + "similar", ] [[package]] name = "egui-wgpu" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "ahash", "bytemuck", @@ -1474,7 +1475,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "ahash", "arboard", @@ -1492,7 +1493,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "ahash", "egui", @@ -1509,7 +1510,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "ahash", "bytemuck", @@ -1588,7 +1589,7 @@ checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b" [[package]] name = "emath" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "bytemuck", "serde", @@ -1686,13 +1687,13 @@ dependencies = [ [[package]] name = "epaint" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" dependencies = [ "ab_glyph", "ahash", "bytemuck", "ecolor", - "emath 0.31.1 (git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc)", + "emath 0.31.1 (git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd)", "epaint_default_fonts", "log", "nohash-hasher", @@ -1704,7 +1705,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.31.1" -source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc" +source = "git+https://github.com/kernelkind/egui?rev=a67ab901e197ce13948ff7d00aa6e07e31a68ccd#a67ab901e197ce13948ff7d00aa6e07e31a68ccd" [[package]] name = "equator" @@ -5348,6 +5349,12 @@ dependencies = [ "quote", ] +[[package]] +name = "similar" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" + [[package]] name = "simplecss" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index c9097ebc..e6b8402b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,12 +101,12 @@ strip = true # Strip symbols from binary* #egui_extras = { path = "/home/jb55/dev/github/emilk/egui/crates/egui_extras" } #epaint = { path = "/home/jb55/dev/github/emilk/egui/crates/epaint" } -egui = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" } -eframe = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" } -egui-winit = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" } -egui-wgpu = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" } -egui_extras = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" } -epaint = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" } +egui = { git = "https://github.com/kernelkind/egui", rev = "a67ab901e197ce13948ff7d00aa6e07e31a68ccd" } +eframe = { git = "https://github.com/kernelkind/egui", rev = "a67ab901e197ce13948ff7d00aa6e07e31a68ccd" } +egui-winit = { git = "https://github.com/kernelkind/egui", rev = "a67ab901e197ce13948ff7d00aa6e07e31a68ccd" } +egui-wgpu = { git = "https://github.com/kernelkind/egui", rev = "a67ab901e197ce13948ff7d00aa6e07e31a68ccd" } +egui_extras = { git = "https://github.com/kernelkind/egui", rev = "a67ab901e197ce13948ff7d00aa6e07e31a68ccd" } +epaint = { git = "https://github.com/kernelkind/egui", rev = "a67ab901e197ce13948ff7d00aa6e07e31a68ccd" } puffin = { git = "https://github.com/jb55/puffin", package = "puffin", rev = "c6a6242adaf90b6292c0f462d2acd34d96d224d2" } puffin_egui = { git = "https://github.com/jb55/puffin", package = "puffin_egui", rev = "c6a6242adaf90b6292c0f462d2acd34d96d224d2" } #winit = { git = "https://github.com/damus-io/winit", rev = "14d61a74bee0c9863abe7ef28efae2c4d8bd3743" }