update to latest master
for iced and make sure everything is ready for weird bug
This commit is contained in:
parent
f9e9a26060
commit
09c30070ca
4 changed files with 18 additions and 17 deletions
24
Cargo.lock
generated
24
Cargo.lock
generated
|
@ -1363,7 +1363,7 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced"
|
name = "iced"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_core",
|
"iced_core",
|
||||||
"iced_debug",
|
"iced_debug",
|
||||||
|
@ -1379,7 +1379,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_core"
|
name = "iced_core"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
@ -1396,7 +1396,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_debug"
|
name = "iced_debug"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_core",
|
"iced_core",
|
||||||
"log",
|
"log",
|
||||||
|
@ -1405,7 +1405,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_futures"
|
name = "iced_futures"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures",
|
"futures",
|
||||||
"iced_core",
|
"iced_core",
|
||||||
|
@ -1419,7 +1419,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_graphics"
|
name = "iced_graphics"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
|
@ -1439,7 +1439,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_program"
|
name = "iced_program"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_graphics",
|
"iced_graphics",
|
||||||
"iced_runtime",
|
"iced_runtime",
|
||||||
|
@ -1448,7 +1448,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_renderer"
|
name = "iced_renderer"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_graphics",
|
"iced_graphics",
|
||||||
"iced_tiny_skia",
|
"iced_tiny_skia",
|
||||||
|
@ -1460,7 +1460,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_runtime"
|
name = "iced_runtime"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"iced_core",
|
"iced_core",
|
||||||
|
@ -1473,7 +1473,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_tiny_skia"
|
name = "iced_tiny_skia"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"cosmic-text",
|
"cosmic-text",
|
||||||
|
@ -1505,7 +1505,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_wgpu"
|
name = "iced_wgpu"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
|
@ -1524,7 +1524,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_widget"
|
name = "iced_widget"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_renderer",
|
"iced_renderer",
|
||||||
"iced_runtime",
|
"iced_runtime",
|
||||||
|
@ -1538,7 +1538,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_winit"
|
name = "iced_winit"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
source = "git+https://github.com/iced-rs/iced.git?rev=482d54118a733231cdceb4ab8eef2419fbec385e#482d54118a733231cdceb4ab8eef2419fbec385e"
|
source = "git+https://github.com/iced-rs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_debug",
|
"iced_debug",
|
||||||
"iced_program",
|
"iced_program",
|
||||||
|
|
|
@ -6,7 +6,7 @@ edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
directories = "6.0.0"
|
directories = "6.0.0"
|
||||||
iced = { git = "https://github.com/iced-rs/iced.git", rev = "482d54118a733231cdceb4ab8eef2419fbec385e", features = ["tokio", "tiny-skia", "wgpu", "image"], default-features = false }
|
iced = { git = "https://github.com/iced-rs/iced.git", rev = "388a419", features = ["tokio", "tiny-skia", "wgpu", "image"], default-features = false }
|
||||||
image = "0.25.6"
|
image = "0.25.6"
|
||||||
serde = { version = "1.0.219", features = ["serde_derive"] }
|
serde = { version = "1.0.219", features = ["serde_derive"] }
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.140"
|
||||||
|
|
|
@ -16,8 +16,8 @@ exclude = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
iced = { git = "https://github.com/iced-rs/iced.git", rev = "482d54118a733231cdceb4ab8eef2419fbec385e", features = ["tokio", "wgpu", "image", "advanced"], default-features = false }
|
iced = { git = "https://github.com/iced-rs/iced.git", rev = "388a419", features = ["tokio", "wgpu", "image", "advanced"], default-features = false }
|
||||||
iced_wgpu = { git = "https://github.com/iced-rs/iced.git", rev = "482d54118a733231cdceb4ab8eef2419fbec385e" }
|
iced_wgpu = { git = "https://github.com/iced-rs/iced.git", rev = "388a419" }
|
||||||
gstreamer = "0.23.5"
|
gstreamer = "0.23.5"
|
||||||
gstreamer-app = "0.23.5" # appsink
|
gstreamer-app = "0.23.5" # appsink
|
||||||
gstreamer-base = "0.23.5" # basesrc
|
gstreamer-base = "0.23.5" # basesrc
|
||||||
|
|
|
@ -255,7 +255,7 @@ impl Launcher {
|
||||||
match self {
|
match self {
|
||||||
Launcher::Loading => center(text("Loading...").size(50)).into(),
|
Launcher::Loading => center(text("Loading...").size(50)).into(),
|
||||||
Launcher::Loaded(state) => {
|
Launcher::Loaded(state) => {
|
||||||
let game_selector = opaque(mouse_area(container(
|
let game_selector = mouse_area(container(
|
||||||
row![
|
row![
|
||||||
get_game_icon(state, &PossibleGames::WutheringWaves),
|
get_game_icon(state, &PossibleGames::WutheringWaves),
|
||||||
get_game_icon(state, &PossibleGames::ZenlessZoneZero),
|
get_game_icon(state, &PossibleGames::ZenlessZoneZero),
|
||||||
|
@ -269,7 +269,8 @@ impl Launcher {
|
||||||
.align_x(Center)
|
.align_x(Center)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.style(move |_| style_container(0.0, true)))
|
.style(move |_| style_container(0.0, true)))
|
||||||
.on_press(Message::DragStarted()));
|
.on_press(Message::DragStarted())
|
||||||
|
.interaction(Interaction::Grab);
|
||||||
|
|
||||||
let topbar = container(
|
let topbar = container(
|
||||||
row![
|
row![
|
||||||
|
|
Loading…
Reference in a new issue