commit 83197bac78303ce588f2b75f67ee80f18f005a81
parent 7a113825dd77caebb0cc0bc91ca04eea4f832163
Author: kernelkind <kernelkind@gmail.com>
Date: Mon, 1 Apr 2024 11:04:46 -0400
Update egui 0.26.1 -> 0.27.1
Needed for shadows
Signed-off-by: kernelkind <kernelkind@gmail.com>
Diffstat:
3 files changed, 77 insertions(+), 32 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -1019,6 +1019,12 @@ name = "ecolor"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c912193fa5698d4fbc857b831fb96b42215dcf565e06012993a65901299a21f"
+
+[[package]]
+name = "ecolor"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb152797942f72b84496eb2ebeff0060240e0bf55096c4525ffa22dd54722d86"
dependencies = [
"bytemuck",
"serde",
@@ -1026,14 +1032,14 @@ dependencies = [
[[package]]
name = "eframe"
-version = "0.26.1"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31ff7b8ea429daa1370069cdca84cce0bc8e4358068fc50daef5e07b7e84481"
+checksum = "3bcc8e06df6f0a6cf09a3247ff7e85fdfffc28dda4fe5561e05314bf7618a918"
dependencies = [
"bytemuck",
"cocoa",
"document-features",
- "egui",
+ "egui 0.27.1",
"egui-wgpu",
"egui-winit",
"egui_glow",
@@ -1067,9 +1073,20 @@ version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abecd396ede556116fceaa0098a1c9278ef526119c5097311eac4bcf57484c52"
dependencies = [
+ "ahash",
+ "epaint 0.26.1",
+ "nohash-hasher",
+]
+
+[[package]]
+name = "egui"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1b8cc14b0b260aa6bd124ef12c8a94f57ffe8e40aa970f3db710c21bb945f3"
+dependencies = [
"accesskit",
"ahash",
- "epaint",
+ "epaint 0.27.1",
"log",
"nohash-hasher",
"puffin",
@@ -1078,14 +1095,14 @@ dependencies = [
[[package]]
name = "egui-wgpu"
-version = "0.26.1"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3b9dafdf68e57b0553205fa32bb111d84573de58410cd5fa448dc716e1d597"
+checksum = "04ee072f7cbd9e03ae4028db1c4a8677fbb4efc4b62feee6563763a6f041c88d"
dependencies = [
"bytemuck",
"document-features",
- "egui",
- "epaint",
+ "egui 0.27.1",
+ "epaint 0.27.1",
"log",
"puffin",
"thiserror",
@@ -1097,12 +1114,12 @@ dependencies = [
[[package]]
name = "egui-winit"
-version = "0.26.1"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ef887214f5b65883cd1c85b0a5335e06f2876446c67fb64939c1ef0be518e0"
+checksum = "3733435d6788c760bb98ce4cb1b8b7a2d953a3a7b421656ba8b3e014019be3d0"
dependencies = [
"arboard",
- "egui",
+ "egui 0.27.1",
"log",
"puffin",
"raw-window-handle 0.6.0",
@@ -1114,12 +1131,12 @@ dependencies = [
[[package]]
name = "egui_extras"
-version = "0.26.1"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "011213c1c95821080d1ea7a28cb2928f89df4d794a4c5f0ed034958966c58860"
+checksum = "70edf79855c42e55c357f7f97cd3be9be59cee2585cc39045ce8ff187aa8d4b0"
dependencies = [
- "egui",
- "ehttp 0.4.0",
+ "egui 0.27.1",
+ "ehttp 0.5.0",
"enum-map",
"image",
"log",
@@ -1130,18 +1147,17 @@ dependencies = [
[[package]]
name = "egui_glow"
-version = "0.26.1"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95307de94643fc205543c4145f2ce254685f6a6ead906393e3996ede9a67b87f"
+checksum = "f933e9e64c4d074c78ce71785a5778f648453c2b2a3efd28eea189dac3f19c28"
dependencies = [
"bytemuck",
- "egui",
+ "egui 0.27.1",
"egui-winit",
"glow",
"log",
- "memoffset",
+ "memoffset 0.9.1",
"puffin",
- "raw-window-handle 0.5.2",
"wasm-bindgen",
"web-sys",
]
@@ -1161,9 +1177,9 @@ dependencies = [
[[package]]
name = "ehttp"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e598cc2bfc28612f26426259ed99a978270e9433d63ae6d2843e30fb0974cd02"
+checksum = "59a81c221a1e4dad06cb9c9deb19aea1193a5eea084e8cd42d869068132bf876"
dependencies = [
"document-features",
"js-sys",
@@ -1184,6 +1200,12 @@ name = "emath"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2386663fafbd043f2cd14f0ded4702deb9348fb7e7bacba9c9087a31b17487f1"
+
+[[package]]
+name = "emath"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555a7cbfcc52c81eb5f8f898190c840fa1c435f67f30b7ef77ce7cf6b7dcd987"
dependencies = [
"bytemuck",
"serde",
@@ -1289,9 +1311,23 @@ checksum = "36ac8c9ca960f0263856a7fbc90d7ad41280e8865a7cd3c64d3daec016bd7115"
dependencies = [
"ab_glyph",
"ahash",
+ "ecolor 0.26.1",
+ "emath 0.26.1",
+ "nohash-hasher",
+ "parking_lot",
+]
+
+[[package]]
+name = "epaint"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd63c37156e949bda80f7e39cc11508bc34840aecf52180567e67cdb2bf1a5fe"
+dependencies = [
+ "ab_glyph",
+ "ahash",
"bytemuck",
- "ecolor",
- "emath",
+ "ecolor 0.27.1",
+ "emath 0.27.1",
"log",
"nohash-hasher",
"parking_lot",
@@ -2266,6 +2302,15 @@ dependencies = [
]
[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
name = "metal"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2418,7 +2463,7 @@ dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
- "memoffset",
+ "memoffset 0.7.1",
]
[[package]]
@@ -2563,7 +2608,7 @@ dependencies = [
"base32",
"console_error_panic_hook",
"eframe",
- "egui",
+ "egui 0.27.1",
"egui_extras",
"ehttp 0.2.0",
"enostr",
@@ -3034,7 +3079,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49058d85ba61f403263d90fe72df1da7f60522a2fcd3a44a4f6acd5459106081"
dependencies = [
- "egui",
+ "egui 0.26.1",
"indexmap",
"natord",
"once_cell",
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,12 +11,12 @@ edition = "2021"
crate-type = ["lib", "cdylib"]
[dependencies]
-#egui-android = { git = "https://github.com/jb55/egui-android.git" }
-egui = "0.26.0"
-eframe = { version = "0.26.0", default-features = false, features = [ "glow", "wgpu", "android-native-activity" ] }
+#egui-android = { git = "https://github.com/jb55/egui-android.git" }
+egui = "0.27.1"
+eframe = { version = "0.27.1", default-features = false, features = [ "glow", "wgpu", "android-native-activity" ] }
#eframe = { version = "0.26.0", default-features = false, features = [ "glow", "android-native-activity" ] }
#eframe = "0.22.0"
-egui_extras = { version = "0.26.0", features = ["all_loaders"] }
+egui_extras = { version = "0.27.1", features = ["all_loaders"] }
ehttp = "0.2.0"
image = { version = "0.24", features = ["jpeg", "png", "webp"] }
log = "0.4.17"
diff --git a/src/ui.rs b/src/ui.rs
@@ -1,4 +1,4 @@
-use egui::style::Margin;
+use egui::Margin;
pub fn padding<R>(
amount: impl Into<Margin>,
