mirror of
https://github.com/Cyrix126/gupaxx.git
synced 2024-12-22 14:49:21 +00:00
feat: upgrade deps for ui and fix breaking change
This commit is contained in:
Cyrix126
parent
c9934ab7e5
commit
29821566da
4 changed files with 32 additions and 32 deletions
42
Cargo.lock
generated
42
Cargo.lock
generated
|
|
@ -1314,9 +1314,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
|
|||
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e"
|
||||
checksum = "c416b34b29e8f6b2492b5c80319cf9792d339550f0d75a54b53ed070045bbdeb"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"serde",
|
||||
|
|
@ -1324,9 +1324,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "eframe"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c456c1bb6d13bf68b780257484703d750c70a23ff891ba35f4d6e23a4dbdf26f"
|
||||
checksum = "86811b20df847cfa73637020ee78de780407110f49785df2dea6741146ea5aac"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cocoa",
|
||||
|
|
@ -1360,9 +1360,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0"
|
||||
checksum = "f8e20541e5d3da08cf817eb5c8a2bc4024f21aad7acf98de201442d6d76e0ecc"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"ahash",
|
||||
|
|
@ -1375,9 +1375,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui-wgpu"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86f2d75e1e70228e7126f828bac05f9fe0e7ea88e9660c8cebe609bb114c61d4"
|
||||
checksum = "25d1c9a6f17f48a75148e7a3db7cc0221b7261db577281267301f83d79d0834a"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"document-features",
|
||||
|
|
@ -1393,9 +1393,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui-winit"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa4d44f8d89f70d4480545eb2346b76ea88c3022e9f4706cebc799dbe8b004a2"
|
||||
checksum = "ff4fc01bc3617dba9280475e9ab2382015e298f401d2318c2a1d78c419b6dffe"
|
||||
dependencies = [
|
||||
"accesskit_winit",
|
||||
"arboard",
|
||||
|
|
@ -1410,9 +1410,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui_extras"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f4a6962241a76da5be5e64e41b851ee1c95fda11f76635522a3c82b119b5475"
|
||||
checksum = "f097daa92d09cc4561f817e2f9733c55af3b157cf437ee3a401cdf038e75fcdc"
|
||||
dependencies = [
|
||||
"egui",
|
||||
"enum-map",
|
||||
|
|
@ -1424,9 +1424,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui_glow"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a08e3be8728b4c59493dbfec041c657e6725bdeafdbd49aef3f1dbb9e551fa01"
|
||||
checksum = "743380a1c0f1dbb7bfe29663ce62b10785adda51105c9bb4e544e2f9955b4958"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"egui",
|
||||
|
|
@ -1446,9 +1446,9 @@ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
|
|||
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09"
|
||||
checksum = "e87799f56edee11422267e1764dd0bf3fe1734888e8d2d0924a67b85f4998fbe"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"serde",
|
||||
|
|
@ -1538,9 +1538,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.26.2"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af"
|
||||
checksum = "392eccd6d6b13fadccc268f4f61d9363775ec5711ffdece2a79006d676920bcf"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"ahash",
|
||||
|
|
@ -2549,7 +2549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-targets 0.48.5",
|
||||
"windows-targets 0.52.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4317,9 +4317,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.36.0"
|
||||
version = "1.37.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
|
||||
checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
|
|
|
|||
14
Cargo.toml
14
Cargo.toml
|
|
@ -33,8 +33,8 @@ benri = "0.1.12"
|
|||
bytes = "1.6.0"
|
||||
dirs = "5.0.1"
|
||||
#--------------------------------------------------------------------------------
|
||||
egui = "0.26.2"
|
||||
egui_extras = { version = "0.26.2", features = ["image"] }
|
||||
egui = "0.27.0"
|
||||
egui_extras = { version = "0.27.0", features = ["image"] }
|
||||
## 2023-12-28: https://github.com/hinto-janai/gupax/issues/68
|
||||
##
|
||||
## 2024-03-18: Both `glow` and `wgpu` seem to crash:
|
||||
|
|
@ -71,7 +71,7 @@ serde = { version = "1.0.197", features = ["rc", "derive"] }
|
|||
serde_json = "1.0.115"
|
||||
sysinfo = { version = "0.30.7", default-features = false }
|
||||
# tls-api = "0.9.0"
|
||||
tokio = { version = "1.36.0", features = ["rt", "time", "macros", "process", "rt-multi-thread"] }
|
||||
tokio = { version = "1.37.0", features = ["rt", "time", "macros", "process", "rt-multi-thread"] }
|
||||
toml = { version = "0.8.12", features = ["preserve_order"] }
|
||||
walkdir = "2.5.0"
|
||||
zeroize = "1.7.0"
|
||||
|
|
@ -83,13 +83,13 @@ readable = "0.16"
|
|||
chrono = {version="0.4.37", default-features=false, features=["clock", "std"]}
|
||||
# Unix dependencies
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
eframe = { version = "0.26.2", features = ["wgpu"] }
|
||||
eframe = { version = "0.27.0", features = ["wgpu"] }
|
||||
tar = "0.4.40"
|
||||
flate2 = "1.0"
|
||||
sudo = "0.6.0"
|
||||
# macOS
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
eframe = { version = "0.26.2", features = ["wgpu"] }
|
||||
eframe = { version = "0.27.0", features = ["wgpu"] }
|
||||
# On apple-darwin targets there is an issue with the native and rustls
|
||||
# tls implementation so this makes it fall back to the openssl variant.
|
||||
#
|
||||
|
|
@ -103,7 +103,7 @@ eframe = { version = "0.26.2", features = ["wgpu"] }
|
|||
# linked as well which causes problems, so statically link it.
|
||||
lzma-sys = { version = "0.1.20", features = ["static"] }
|
||||
[dev-dependencies]
|
||||
egui = {version = "0.26.2", features=["callstack"]}
|
||||
egui = {version = "0.27.0", features=["callstack"]}
|
||||
|
||||
# [target.'cfg(not(target_os = "macos"))'.dependencies]
|
||||
# tls-api-native-tls = "0.9.0"
|
||||
|
|
@ -111,7 +111,7 @@ egui = {version = "0.26.2", features=["callstack"]}
|
|||
# Windows dependencies
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
# glow start on windows but not wgpu
|
||||
eframe = { version = "0.26.2", features = ["glow"] }
|
||||
eframe = { version = "0.27.0", features = ["glow"] }
|
||||
zip = "0.6.6"
|
||||
is_elevated = "0.1.2"
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ impl App {
|
|||
// It incrementally becomes more opaque until [self.alpha] >= 250, when we just switch to pure black (no alpha).
|
||||
// When black, we're safe to [init_text_styles()], and then incrementally go transparent, until we remove the layer.
|
||||
if self.resizing {
|
||||
egui::Area::new("resize_layer")
|
||||
egui::Area::new("resize_layer".into())
|
||||
.order(egui::Order::Foreground)
|
||||
.anchor(egui::Align2::CENTER_CENTER, (0.0, 0.0))
|
||||
.show(ctx, |ui| {
|
||||
|
|
@ -57,7 +57,7 @@ impl App {
|
|||
}
|
||||
});
|
||||
} else if self.alpha != 0 {
|
||||
egui::Area::new("resize_layer")
|
||||
egui::Area::new("resize_layer".into())
|
||||
.order(egui::Order::Foreground)
|
||||
.anchor(egui::Align2::CENTER_CENTER, (0.0, 0.0))
|
||||
.show(ctx, |ui| {
|
||||
|
|
|
|||
|
|
@ -541,8 +541,8 @@ pub static VISUALS: Lazy<Visuals> = Lazy::new(|| {
|
|||
warn_fg_color: Color32::from_rgb(255, 143, 0), // orange
|
||||
error_fg_color: Color32::from_rgb(255, 0, 0), // red
|
||||
window_rounding: Rounding::same(6.0),
|
||||
window_shadow: Shadow::big_dark(),
|
||||
popup_shadow: Shadow::small_dark(),
|
||||
window_shadow: Shadow::NONE,
|
||||
popup_shadow: Shadow::NONE,
|
||||
..Visuals::dark()
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue