From d32f2b538d24a2de29d7b929c27447f0c9153bd8 Mon Sep 17 00:00:00 2001 From: Dark-Alex-17 Date: Tue, 8 Aug 2023 10:50:07 -0600 Subject: [PATCH] Fixed a bug in the UI that would scroll text on edit window popups when it shouldn't --- src/app/mod.rs | 2 +- src/ui/radarr_ui/edit_collection_ui.rs | 6 ++++-- src/ui/radarr_ui/edit_movie_ui.rs | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/mod.rs b/src/app/mod.rs index ee3b6d8..1862591 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -109,7 +109,7 @@ impl<'a> App<'a> { self.push_navigation_stack(route); } - pub fn get_current_route(&'a self) -> &'a Route { + pub fn get_current_route(&self) -> &Route { self.navigation_stack.last().unwrap_or(&DEFAULT_ROUTE) } } diff --git a/src/ui/radarr_ui/edit_collection_ui.rs b/src/ui/radarr_ui/edit_collection_ui.rs index 6051b0c..b9e95f7 100644 --- a/src/ui/radarr_ui/edit_collection_ui.rs +++ b/src/ui/radarr_ui/edit_collection_ui.rs @@ -92,7 +92,8 @@ fn draw_edit_collection_confirmation_prompt( .collections .current_selection() .title - .to_string(), + .text + .clone(), app .data .radarr_data @@ -110,7 +111,8 @@ fn draw_edit_collection_confirmation_prompt( .filtered_collections .current_selection() .title - .to_string(), + .text + .clone(), app .data .radarr_data diff --git a/src/ui/radarr_ui/edit_movie_ui.rs b/src/ui/radarr_ui/edit_movie_ui.rs index 90ea2ad..ca9a31a 100644 --- a/src/ui/radarr_ui/edit_movie_ui.rs +++ b/src/ui/radarr_ui/edit_movie_ui.rs @@ -87,7 +87,8 @@ fn draw_edit_movie_confirmation_prompt( .movies .current_selection() .title - .to_string(), + .text + .clone(), app .data .radarr_data @@ -104,7 +105,8 @@ fn draw_edit_movie_confirmation_prompt( .filtered_movies .current_selection() .title - .to_string(), + .text + .clone(), app .data .radarr_data