make unavailable mods less intrusive.

Author: derspyy

src/main.rs

@@ -1,7 +1,6 @@
 #![windows_subsystem = "windows"]
 
 use anyhow::Result;
-use iced::alignment::Horizontal;
 use iced::futures::TryFutureExt;
 use serde::Deserialize;
 
@@ -11,7 +10,7 @@ mod install_velvet;
 mod theme;
 pub mod write_json;
 
-use iced::widget::{Column, Space, button, checkbox, column, pick_list, text};
+use iced::widget::{Column, Space, button, checkbox, column, container, pick_list, text, tooltip};
 use iced::{Alignment, Element, Length, Size, Task, Theme, application, theme::Palette, window};
 
 #[derive(Deserialize)]
@@ -51,7 +50,7 @@ enum Status {
     Idle,
     Installing,
     NoVersion,
-    Success(Option<Vec<String>>),
+    Success(Vec<String>),
     Failure(String),
 }
 
@@ -124,16 +123,16 @@ impl Velvet {
                 };
             }
             Message::Done(value) => match value {
-                Ok(x) => match x.is_empty() {
-                    true => self.status = Status::Success(None),
-                    false => {
-                        self.status = Status::Success(Some(x));
+                Ok(x) => {
+                    let missing_mods = !x.is_empty();
+                    self.status = Status::Success(x);
+                    if missing_mods {
                         return window::get_latest()
-                            .and_then(move |id| window::resize(id, (500.0, 350.0).into()));
-                    }
-                },
-                Err(x) => {
-                    self.status = Status::Failure(x);
+                            .and_then(move |id| window::resize(id, (500.0, 275.0).into()));
+                    };
+                }
+                Err(e) => {
+                    self.status = Status::Failure(e);
                     return window::get_latest()
                         .and_then(move |id| window::resize(id, (500.0, 275.0).into()));
                 }
@@ -143,75 +142,74 @@ impl Velvet {
     }
 
     fn view(&self) -> Column<Message> {
-        let (button_message, extra_message): (&str, Element<Message>) = match &self.status {
-            Status::Idle => ("Install", column!().into()),
-            Status::Installing => ("Installing...", column!().into()),
-            Status::NoVersion => ("No version selected!", column!().into()),
+        let (button_message, extra_message): (&str, Option<Element<Message>>) = match &self.status {
+            Status::Idle => ("Install", None),
+            Status::Installing => ("Installing...", None),
+            Status::NoVersion => ("No version selected!", None),
             Status::Success(mods) => (
                 "Finished!",
-                match mods {
-                    Some(mods) => {
+                if !mods.is_empty() {
+                    Some({
                         let mut mod_string = String::new();
                         mod_string.push_str(&mods[0]);
                         for name in mods.iter().skip(1) {
                             mod_string.push_str(", ");
                             mod_string.push_str(name);
                         }
-                        column![
-                            text("The mods"),
-                            text(mod_string)
-                                .color(theme::LOVE)
-                                .align_x(Horizontal::Center),
-                            text("were unavailable.")
-                        ]
-                        .align_x(Alignment::Center)
+                        tooltip(
+                            "Hover to see unavailable mods.",
+                            container(text(mod_string)),
+                            tooltip::Position::FollowCursor,
+                        )
+                        .style(theme::container_style)
                         .into()
-                    }
-                    None => column!().into(),
+                    })
+                } else {
+                    None
                 },
             ),
-            Status::Failure(message) => ("Error!", text(message).color(theme::LOVE).into()),
+            Status::Failure(e) => ("Error!", Some(text(e).color(theme::LOVE).into())),
         };
+
         column![
-            Space::with_height(Length::Fixed(10.0)),
             text("Enter Minecraft version:").size(20),
-            Space::with_height(Length::Fixed(5.0)),
             pick_list(
                 self.version_list.clone(),
                 self.version.clone(),
                 Message::Update
             )
             .placeholder("Loading...")
             .width(Length::Fixed(200.0))
-            .style(|_, status| theme::pick_list_style(status))
-            .menu_style(|_| theme::menu_style()),
-            Space::with_height(Length::Fixed(5.0)),
+            .style(theme::pick_list_style)
+            .menu_style(theme::menu_style),
+            Space::with_height(Length::Fill),
             checkbox("Show snapshots", self.snapshot)
                 .on_toggle(Message::Snapshot)
-                .style(|_, status| theme::checkbox_style(status)),
-            Space::with_height(Length::Fill),
+                .style(theme::checkbox_style),
             column![
                 checkbox("Vanilla - Performance enhancing modlist.", self.vanilla,)
                     .on_toggle(Message::VButton)
-                    .style(|_, status| theme::checkbox_style(status)),
-                Space::with_height(Length::Fixed(5.0)),
+                    .style(theme::checkbox_style),
                 checkbox("Beauty - Immersive and beautiful modlist.", self.beauty,)
                     .on_toggle(Message::BButton)
-                    .style(|_, status| theme::checkbox_style(status)),
-                Space::with_height(Length::Fixed(5.0)),
+                    .style(theme::checkbox_style),
                 checkbox("Optifine - Optifine resource pack parity.", self.optifine,)
                     .on_toggle(Message::OButton)
-                    .style(|_, status| theme::checkbox_style(status)),
+                    .style(theme::checkbox_style),
             ]
             .align_x(Alignment::Start),
             Space::with_height(Length::Fill),
-            extra_message,
-            Space::with_height(Length::Fill),
             button(button_message)
                 .on_press(Message::Pressed)
-                .style(|_, status| theme::button_style(status)),
-            Space::with_height(Length::Fixed(10.0)),
+                .style(theme::button_style),
+            if let Some(message) = extra_message {
+                message
+            } else {
+                column![].into()
+            },
         ]
+        .spacing(5.0)
+        .padding(10.0)
         .align_x(Alignment::Center)
         .width(Length::Fill)
         .height(Length::Fill)

src/theme.rs

@@ -1,9 +1,9 @@
 use iced::{
-    Background, Border, Color, Shadow, Vector,
+    Background, Border, Color, Shadow, Theme, Vector,
     border::Radius,
     color,
     overlay::menu,
-    widget::{button, checkbox, pick_list},
+    widget::{button, checkbox, container, pick_list},
 };
 
 // rosé pine.
@@ -15,7 +15,24 @@ pub const SUBTLE: Color = color!(0x908caa);
 pub const LOVE: Color = color!(0xeb6f92);
 pub const FOAM: Color = color!(0x9ccfd8);
 
-pub fn pick_list_style(status: pick_list::Status) -> pick_list::Style {
+pub fn container_style(_: &Theme) -> container::Style {
+    container::Style {
+        text_color: None,
+        background: Some(Background::Color(BASE)),
+        border: Border {
+            color: LOVE,
+            width: 1.0,
+            radius: Radius::new(10.0),
+        },
+        shadow: Shadow {
+            color: BASE,
+            offset: Vector::new(0.0, 0.0),
+            blur_radius: 0.0,
+        },
+    }
+}
+
+pub fn pick_list_style(_: &Theme, status: pick_list::Status) -> pick_list::Style {
     pick_list::Style {
         text_color: TEXT,
         placeholder_color: SUBTLE,
@@ -32,7 +49,7 @@ pub fn pick_list_style(status: pick_list::Status) -> pick_list::Style {
     }
 }
 
-pub fn menu_style() -> menu::Style {
+pub fn menu_style(_: &Theme) -> menu::Style {
     menu::Style {
         text_color: TEXT,
         background: Background::Color(SURFACE),
@@ -46,7 +63,7 @@ pub fn menu_style() -> menu::Style {
     }
 }
 
-pub fn checkbox_style(status: checkbox::Status) -> checkbox::Style {
+pub fn checkbox_style(_: &Theme, status: checkbox::Status) -> checkbox::Style {
     checkbox::Style {
         background: Background::Color(match status {
             checkbox::Status::Active { is_checked } if is_checked => FOAM,
@@ -64,7 +81,7 @@ pub fn checkbox_style(status: checkbox::Status) -> checkbox::Style {
     }
 }
 
-pub fn button_style(status: button::Status) -> button::Style {
+pub fn button_style(_: &Theme, status: button::Status) -> button::Style {
     button::Style {
         background: Some(Background::Color(LOVE)),
         text_color: match status {