Update egui 0.26.1 -> 0.27.1

Needed for shadows

Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2024-04-01 11:04:46 -04:00
committed by William Casarin
parent 7a113825dd
commit 83197bac78
3 changed files with 77 additions and 32 deletions

99
Cargo.lock generated
View File

@@ -1019,6 +1019,12 @@ name = "ecolor"
version = "0.26.1" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c912193fa5698d4fbc857b831fb96b42215dcf565e06012993a65901299a21f" checksum = "9c912193fa5698d4fbc857b831fb96b42215dcf565e06012993a65901299a21f"
[[package]]
name = "ecolor"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb152797942f72b84496eb2ebeff0060240e0bf55096c4525ffa22dd54722d86"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@@ -1026,14 +1032,14 @@ dependencies = [
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.26.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f31ff7b8ea429daa1370069cdca84cce0bc8e4358068fc50daef5e07b7e84481" checksum = "3bcc8e06df6f0a6cf09a3247ff7e85fdfffc28dda4fe5561e05314bf7618a918"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cocoa", "cocoa",
"document-features", "document-features",
"egui", "egui 0.27.1",
"egui-wgpu", "egui-wgpu",
"egui-winit", "egui-winit",
"egui_glow", "egui_glow",
@@ -1066,10 +1072,21 @@ name = "egui"
version = "0.26.1" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abecd396ede556116fceaa0098a1c9278ef526119c5097311eac4bcf57484c52" 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 = [ dependencies = [
"accesskit", "accesskit",
"ahash", "ahash",
"epaint", "epaint 0.27.1",
"log", "log",
"nohash-hasher", "nohash-hasher",
"puffin", "puffin",
@@ -1078,14 +1095,14 @@ dependencies = [
[[package]] [[package]]
name = "egui-wgpu" name = "egui-wgpu"
version = "0.26.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c3b9dafdf68e57b0553205fa32bb111d84573de58410cd5fa448dc716e1d597" checksum = "04ee072f7cbd9e03ae4028db1c4a8677fbb4efc4b62feee6563763a6f041c88d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"document-features", "document-features",
"egui", "egui 0.27.1",
"epaint", "epaint 0.27.1",
"log", "log",
"puffin", "puffin",
"thiserror", "thiserror",
@@ -1097,12 +1114,12 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.26.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0ef887214f5b65883cd1c85b0a5335e06f2876446c67fb64939c1ef0be518e0" checksum = "3733435d6788c760bb98ce4cb1b8b7a2d953a3a7b421656ba8b3e014019be3d0"
dependencies = [ dependencies = [
"arboard", "arboard",
"egui", "egui 0.27.1",
"log", "log",
"puffin", "puffin",
"raw-window-handle 0.6.0", "raw-window-handle 0.6.0",
@@ -1114,12 +1131,12 @@ dependencies = [
[[package]] [[package]]
name = "egui_extras" name = "egui_extras"
version = "0.26.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "011213c1c95821080d1ea7a28cb2928f89df4d794a4c5f0ed034958966c58860" checksum = "70edf79855c42e55c357f7f97cd3be9be59cee2585cc39045ce8ff187aa8d4b0"
dependencies = [ dependencies = [
"egui", "egui 0.27.1",
"ehttp 0.4.0", "ehttp 0.5.0",
"enum-map", "enum-map",
"image", "image",
"log", "log",
@@ -1130,18 +1147,17 @@ dependencies = [
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.26.1" version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95307de94643fc205543c4145f2ce254685f6a6ead906393e3996ede9a67b87f" checksum = "f933e9e64c4d074c78ce71785a5778f648453c2b2a3efd28eea189dac3f19c28"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui 0.27.1",
"egui-winit", "egui-winit",
"glow", "glow",
"log", "log",
"memoffset", "memoffset 0.9.1",
"puffin", "puffin",
"raw-window-handle 0.5.2",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
] ]
@@ -1161,9 +1177,9 @@ dependencies = [
[[package]] [[package]]
name = "ehttp" name = "ehttp"
version = "0.4.0" 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 = "e598cc2bfc28612f26426259ed99a978270e9433d63ae6d2843e30fb0974cd02" checksum = "59a81c221a1e4dad06cb9c9deb19aea1193a5eea084e8cd42d869068132bf876"
dependencies = [ dependencies = [
"document-features", "document-features",
"js-sys", "js-sys",
@@ -1184,6 +1200,12 @@ name = "emath"
version = "0.26.1" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2386663fafbd043f2cd14f0ded4702deb9348fb7e7bacba9c9087a31b17487f1" checksum = "2386663fafbd043f2cd14f0ded4702deb9348fb7e7bacba9c9087a31b17487f1"
[[package]]
name = "emath"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "555a7cbfcc52c81eb5f8f898190c840fa1c435f67f30b7ef77ce7cf6b7dcd987"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@@ -1286,12 +1308,26 @@ name = "epaint"
version = "0.26.1" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36ac8c9ca960f0263856a7fbc90d7ad41280e8865a7cd3c64d3daec016bd7115" 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 = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
"bytemuck", "bytemuck",
"ecolor", "ecolor 0.27.1",
"emath", "emath 0.27.1",
"log", "log",
"nohash-hasher", "nohash-hasher",
"parking_lot", "parking_lot",
@@ -2265,6 +2301,15 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "memoffset"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "metal" name = "metal"
version = "0.27.0" version = "0.27.0"
@@ -2418,7 +2463,7 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"cfg-if", "cfg-if",
"libc", "libc",
"memoffset", "memoffset 0.7.1",
] ]
[[package]] [[package]]
@@ -2563,7 +2608,7 @@ dependencies = [
"base32", "base32",
"console_error_panic_hook", "console_error_panic_hook",
"eframe", "eframe",
"egui", "egui 0.27.1",
"egui_extras", "egui_extras",
"ehttp 0.2.0", "ehttp 0.2.0",
"enostr", "enostr",
@@ -3034,7 +3079,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49058d85ba61f403263d90fe72df1da7f60522a2fcd3a44a4f6acd5459106081" checksum = "49058d85ba61f403263d90fe72df1da7f60522a2fcd3a44a4f6acd5459106081"
dependencies = [ dependencies = [
"egui", "egui 0.26.1",
"indexmap", "indexmap",
"natord", "natord",
"once_cell", "once_cell",

View File

@@ -12,11 +12,11 @@ crate-type = ["lib", "cdylib"]
[dependencies] [dependencies]
#egui-android = { git = "https://github.com/jb55/egui-android.git" } #egui-android = { git = "https://github.com/jb55/egui-android.git" }
egui = "0.26.0" egui = "0.27.1"
eframe = { version = "0.26.0", default-features = false, features = [ "glow", "wgpu", "android-native-activity" ] } 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 = { version = "0.26.0", default-features = false, features = [ "glow", "android-native-activity" ] }
#eframe = "0.22.0" #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" ehttp = "0.2.0"
image = { version = "0.24", features = ["jpeg", "png", "webp"] } image = { version = "0.24", features = ["jpeg", "png", "webp"] }
log = "0.4.17" log = "0.4.17"

View File

@@ -1,4 +1,4 @@
use egui::style::Margin; use egui::Margin;
pub fn padding<R>( pub fn padding<R>(
amount: impl Into<Margin>, amount: impl Into<Margin>,