From 0067872d697008252d22fb7452ce1f0353437557 Mon Sep 17 00:00:00 2001 From: mtkennerly Date: Sat, 21 Sep 2024 21:04:33 -0400 Subject: [PATCH] Use wrapping for scan result filter controls --- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- src/gui/search.rs | 25 +++++++++++-------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e866922..0ac0ac0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ * GUI: Updated to the latest version of [Iced](https://github.com/iced-rs/iced). If the GUI fails to load, Ludusavi will log the error info. * GUI: Modals now display on top of the app with a transparent background. + * GUI: On the backup and restore screens, + the filter controls now wrap depending on the window size. ## v0.25.0 (2024-08-18) diff --git a/Cargo.lock b/Cargo.lock index 6fa80f3..3304a21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2328,9 +2328,9 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eef161bcd216f3472916570919dc3542647285da9cc81085b8d5cb434dc870" +checksum = "81429e1b950b0e4bca65be4c4278fea6678ea782030a411778f26fa9f8983e1d" dependencies = [ "iced_renderer", "iced_runtime", diff --git a/src/gui/search.rs b/src/gui/search.rs index ea344cd..3bfdcfb 100644 --- a/src/gui/search.rs +++ b/src/gui/search.rs @@ -188,21 +188,18 @@ impl FilterComponent { manifests.clone(), Message::EditedSearchFilterManifest, ) - }), + }) + .push_if(manifests.len() > 2, || { + template_with_label( + &self.manifest, + TRANSLATOR.source_field(), + FilterKind::Manifest, + manifests, + Message::EditedSearchFilterManifest, + ) + }) + .wrap(), ) - .push_if(manifests.len() > 2, || { - Row::new() - .padding(padding::left(20).right(0)) - .spacing(15) - .align_y(Alignment::Center) - .push(template_with_label( - &self.manifest, - TRANSLATOR.source_field(), - FilterKind::Manifest, - manifests, - Message::EditedSearchFilterManifest, - )) - }) .into(), ) }