From 981d971fa9087a979f4dea4f825a63c92db9012a Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Thu, 22 Jan 2026 15:40:32 +0100 Subject: [PATCH 1/2] Enable libadwaita feature of Relm4, remove unused direct Tokio dep --- Cargo.lock | 13 ------------- Cargo.toml | 5 +---- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38ed839..7b8d1e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -924,18 +924,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" -dependencies = [ - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -1122,5 +1110,4 @@ dependencies = [ "gtk4", "libadwaita", "relm4", - "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 7542561..b384d38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,4 @@ glib-build-tools = "0.21.0" async-sqlite = { version = "0.5.4", default-features = false } gtk4 = { version = "0.10.3", features = ["v4_20"] } libadwaita = { version = "0.8.1", features = ["v1_8"] } -relm4 = { version = "0.10.1", features = ["gnome_48"] } -# Tokio as included in Relm4 doesn't have the macros feature enabled. -# Keep version in sync with the one Relm4 uses. -tokio = { version = "1.47.3", features = ["macros", "rt", "rt-multi-thread", "sync"] } +relm4 = { version = "0.10.1", features = ["gnome_48", "libadwaita"] } From 2c2afb4b33284c329369eef5e8f9c378407bd129 Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Thu, 22 Jan 2026 15:42:32 +0100 Subject: [PATCH 2/2] Add comments about (Typed)GridView to media grids --- src/ui/components/media_grid/film_grid.rs | 3 +++ src/ui/components/media_grid/series_grid.rs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/ui/components/media_grid/film_grid.rs b/src/ui/components/media_grid/film_grid.rs index de8d08b..0d79ccb 100644 --- a/src/ui/components/media_grid/film_grid.rs +++ b/src/ui/components/media_grid/film_grid.rs @@ -40,6 +40,9 @@ impl Component for FilmGrid { set_propagate_natural_height: true, #[name="grid"] + // TODO: Replace this with a GridView. + // Once this is done we can replace the factory with a TypedGridView for better performance + // (i.e. lazy item rendering) if needed. This should also enable less cursed sorting. FlowBox { set_orientation: Orientation::Horizontal, set_homogeneous: true, diff --git a/src/ui/components/media_grid/series_grid.rs b/src/ui/components/media_grid/series_grid.rs index 6401ecc..7dcfb61 100644 --- a/src/ui/components/media_grid/series_grid.rs +++ b/src/ui/components/media_grid/series_grid.rs @@ -40,6 +40,9 @@ impl Component for SeriesGrid { set_propagate_natural_height: true, #[name="grid"] + // TODO: Replace this with a GridView. + // Once this is done we can replace the factory with a TypedGridView for better performance + // (i.e. lazy item rendering) if needed. This should also enable less cursed sorting. FlowBox { set_orientation: Orientation::Horizontal, set_homogeneous: true,