Merge pull request #488 from andrewdavidmackenzie/pigg-483

Fix dialog spacing

RELEASING.md

@@ -4,6 +4,11 @@ We use `cargo dist` to automate our release and package publishing process.
 
 The steps to do a full release are:
 
+- Merge all pending PRs planned for the release
+- Create a new issue in GitHub based on the "release-manual-testing-template.md" and assign it to the milestone
+  for the release.
+- Go through that new issue for manual testing, performing the manual tests in the matrix and checking them
+  off as done as you go, until all pass.
 - Update the version number (e.g. "1.2.3") in `Cargo.toml` in a new branch, push it, create a PR,
   wait for test sto pass, then merge that PR into master
 - checkout master, pull the latest version

src/piggui.rs

@@ -13,7 +13,7 @@ use crate::Message::*;
 use clap::{Arg, ArgMatches};
 use iced::widget::{container, Column};
 use iced::{
-    executor, window, Application, Command, Element, Length, Settings, Subscription, Theme,
+    executor, window, Application, Command, Element, Length, Pixels, Settings, Subscription, Theme,
 };
 use views::pin_state::PinState;
 
@@ -111,6 +111,7 @@ fn main() -> Result<(), iced::Error> {
 
     Piggui::run(Settings {
         window,
+        default_text_size: Pixels(14.0),
         ..Default::default()
     })
 }

src/views/hardware_view.rs

@@ -491,8 +491,6 @@ fn pullup_picklist(
     .placeholder("Select Pullup");
 
     // select a slightly small font on RPi, to make it fit within pick_list
-    #[cfg(target_os = "linux")]
-    let pick_list = pick_list.text_size(14);
 
     pick_list.into()
 }
@@ -660,8 +658,6 @@ fn create_pin_view_side<'a>(
         .placeholder("Select function");
 
         // select a slightly small font on RPi, to make it fit within pick_list
-        #[cfg(target_os = "linux")]
-        let pick_list = pick_list.text_size(14);
         pin_options_row = pin_options_row.push(pick_list);
 
         pin_option = pin_option.push(pin_options_row);

src/views/modal_handler.rs

@@ -6,7 +6,7 @@ use crate::views::hardware_view::HardwareView;
 use crate::views::version::REPOSITORY;
 use crate::Message;
 use iced::keyboard::key;
-use iced::widget::{button, column, container, text, Row, Text};
+use iced::widget::{button, column, container, text, Row, Space, Text};
 use iced::{keyboard, window, Color, Command, Element, Event, Length};
 use iced_futures::core::Alignment;
 use iced_futures::Subscription;
@@ -200,12 +200,12 @@ impl DisplayModal {
                                 .on_press(Message::ModalHandle(ModalMessage::ExitApp))
                                 .style(MODAL_CANCEL_BUTTON_STYLE.get_button_style()),
                         )
+                        .push(Space::new(235, 10))
                         .push(
                             button("Return to app")
                                 .on_press(Message::ModalHandle(ModalMessage::HideModal))
                                 .style(MODAL_CONNECT_BUTTON_STYLE.get_button_style()),
                         )
-                        .spacing(220);
                 }
 
                 container(