Fix inconsistent spacing around backup controls/filter

mtkennerly · Sep 21, 2024 · b08858c · b08858c
1 parent e238fd4
commit b08858c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
     instead of the intended `<game>/drive-____UNC_localhost_share/test.txt`.
   * When Steam was not installed, the logs would contain a `warning`-level message.
     This has been demoted to an `info`-level message.
+  * GUI: Fixed some inconsistent spacing between elements.
 * Changed:
   * 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.

diff --git a/src/gui/app.rs b/src/gui/app.rs
@@ -3,7 +3,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use iced::{keyboard, padding, widget::scrollable, Alignment, Length, Subscription, Task};
+use iced::{keyboard, widget::scrollable, Alignment, Length, Subscription, Task};
 
 use crate::{
     cloud::{rclone_monitor, Rclone, Remote},
@@ -2733,7 +2733,7 @@ impl App {
             .align_x(Alignment::Center)
             .push(
                 Row::new()
-                    .padding(padding::top(10).right(20).bottom(15).left(20))
+                    .padding([10, 20])
                     .spacing(20)
                     .push(button::nav(Screen::Backup, self.screen))
                     .push(button::nav(Screen::Restore, self.screen))

diff --git a/src/gui/game_list.rs b/src/gui/game_list.rs
@@ -403,6 +403,7 @@ impl GameList {
 
         Container::new(
             Column::new()
+                .spacing(15)
                 .push_maybe({
                     self.search.view(
                         if restoring { Screen::Restore } else { Screen::Backup },

diff --git a/src/gui/screen.rs b/src/gui/screen.rs
@@ -32,7 +32,7 @@ fn template(content: Column) -> Element {
     Container::new(content.spacing(15).align_x(Alignment::Center))
         .height(Length::Fill)
         .center_x(Length::Fill)
-        .padding(padding::all(5).top(0))
+        .padding(padding::all(5))
         .into()
 }
 

diff --git a/src/gui/search.rs b/src/gui/search.rs
@@ -138,9 +138,10 @@ impl FilterComponent {
         }
         Some(
             Column::new()
+                .spacing(15)
                 .push(
                     Row::new()
-                        .padding(padding::top(0).bottom(10).left(20).right(20))
+                        .padding(padding::left(20).right(20))
                         .spacing(20)
                         .align_y(Alignment::Center)
                         .push(text(TRANSLATOR.filter_label()))
@@ -151,8 +152,8 @@ impl FilterComponent {
                 )
                 .push(
                     Row::new()
-                        .padding(padding::all(20).top(0))
-                        .spacing(20)
+                        .padding(padding::left(20).right(20))
+                        .spacing(15)
                         .align_y(Alignment::Center)
                         .push(template(
                             &self.uniqueness,
@@ -191,8 +192,8 @@ impl FilterComponent {
                 )
                 .push_if(manifests.len() > 2, || {
                     Row::new()
-                        .padding(padding::all(20).top(0))
-                        .spacing(20)
+                        .padding(padding::left(20).right(0))
+                        .spacing(15)
                         .align_y(Alignment::Center)
                         .push(template_with_label(
                             &self.manifest,