From 09c30070cabc227025507ad4bdff5d90ed2af733 Mon Sep 17 00:00:00 2001 From: RabbyDevs <67389402+RabbyDevs@users.noreply.github.com> Date: Mon, 21 Apr 2025 04:02:15 +0300 Subject: [PATCH] update to latest `master` for iced and make sure everything is ready for weird bug --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- iced_video_player/Cargo.toml | 4 ++-- src/main.rs | 5 +++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 315a996..7f72796 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1363,7 +1363,7 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iced" 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 = [ "iced_core", "iced_debug", @@ -1379,7 +1379,7 @@ dependencies = [ [[package]] name = "iced_core" 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 = [ "bitflags 2.9.0", "bytes", @@ -1396,7 +1396,7 @@ dependencies = [ [[package]] name = "iced_debug" 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 = [ "iced_core", "log", @@ -1405,7 +1405,7 @@ dependencies = [ [[package]] name = "iced_futures" 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 = [ "futures", "iced_core", @@ -1419,7 +1419,7 @@ dependencies = [ [[package]] name = "iced_graphics" 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 = [ "bitflags 2.9.0", "bytemuck", @@ -1439,7 +1439,7 @@ dependencies = [ [[package]] name = "iced_program" 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 = [ "iced_graphics", "iced_runtime", @@ -1448,7 +1448,7 @@ dependencies = [ [[package]] name = "iced_renderer" 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 = [ "iced_graphics", "iced_tiny_skia", @@ -1460,7 +1460,7 @@ dependencies = [ [[package]] name = "iced_runtime" 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 = [ "bytes", "iced_core", @@ -1473,7 +1473,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" 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 = [ "bytemuck", "cosmic-text", @@ -1505,7 +1505,7 @@ dependencies = [ [[package]] name = "iced_wgpu" 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 = [ "bitflags 2.9.0", "bytemuck", @@ -1524,7 +1524,7 @@ dependencies = [ [[package]] name = "iced_widget" 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 = [ "iced_renderer", "iced_runtime", @@ -1538,7 +1538,7 @@ dependencies = [ [[package]] name = "iced_winit" 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 = [ "iced_debug", "iced_program", diff --git a/Cargo.toml b/Cargo.toml index 8b928b0..fb0cfdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2024" [dependencies] 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" serde = { version = "1.0.219", features = ["serde_derive"] } serde_json = "1.0.140" diff --git a/iced_video_player/Cargo.toml b/iced_video_player/Cargo.toml index 63653cd..a8e3de9 100644 --- a/iced_video_player/Cargo.toml +++ b/iced_video_player/Cargo.toml @@ -16,8 +16,8 @@ exclude = [ ] [dependencies] -iced = { git = "https://github.com/iced-rs/iced.git", rev = "482d54118a733231cdceb4ab8eef2419fbec385e", features = ["tokio", "wgpu", "image", "advanced"], default-features = false } -iced_wgpu = { git = "https://github.com/iced-rs/iced.git", rev = "482d54118a733231cdceb4ab8eef2419fbec385e" } +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 = "388a419" } gstreamer = "0.23.5" gstreamer-app = "0.23.5" # appsink gstreamer-base = "0.23.5" # basesrc diff --git a/src/main.rs b/src/main.rs index 7b7ac93..02bab04 100644 --- a/src/main.rs +++ b/src/main.rs @@ -255,7 +255,7 @@ impl Launcher { match self { Launcher::Loading => center(text("Loading...").size(50)).into(), Launcher::Loaded(state) => { - let game_selector = opaque(mouse_area(container( + let game_selector = mouse_area(container( row![ get_game_icon(state, &PossibleGames::WutheringWaves), get_game_icon(state, &PossibleGames::ZenlessZoneZero), @@ -269,7 +269,8 @@ impl Launcher { .align_x(Center) .width(Length::Fill) .style(move |_| style_container(0.0, true))) - .on_press(Message::DragStarted())); + .on_press(Message::DragStarted()) + .interaction(Interaction::Grab); let topbar = container( row![