rename "configure" to "ripping". tweak scrollbar style

B0ney · Nov 11, 2023 · 49d4281 · 49d4281
1 parent 5b6632c
commit 49d4281
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -425,7 +425,7 @@ impl Application for XMODITS {
 
     fn view(&self) -> Element<Message> {
         let top_left_menu = row![
-            button("Configure").on_press(Message::ConfigPressed),
+            button("Ripping").on_press(Message::ConfigPressed),
             button("Filters").on_press(Message::FilterPressed),
             // button("History").on_press(Message::HistoryPressed),
             button("Settings").on_press(Message::SettingsPressed),

diff --git a/src/icon.rs b/src/icon.rs
@@ -1,5 +1,5 @@
 use iced::alignment;
-use iced::widget::{image, text};
+use iced::widget::{image, text, Image};
 
 use crate::font;
 use crate::widget::Text;
@@ -67,12 +67,12 @@ fn icon(unicode: char) -> Text<'static> {
         .horizontal_alignment(alignment::Horizontal::Center)
 }
 
-pub fn xmodits_logo() -> image::Handle {
-    get_img("xmodits")
+pub fn xmodits_logo() -> Image<image::Handle> {
+    image(get_img("xmodits"))
 }
 
-pub fn vbee3() -> image::Handle {
-    get_img("vbee3")
+pub fn vbee3() -> Image<image::Handle> {
+    image(get_img("vbee3"))
 }
 
 fn get_img(src: &str) -> image::Handle {

diff --git a/src/screen/about.rs b/src/screen/about.rs
@@ -13,9 +13,9 @@ use super::build_info;
 
 pub fn view<'a>() -> Element<'a, Message> {
     let title = row![
-        image(vbee3()),
+        vbee3(),
         centered_text("XMODITS - by B0ney"),
-        image(vbee3()),
+        vbee3(),
     ]
     .align_items(iced::Alignment::Center)
     .spacing(8);
@@ -24,7 +24,7 @@ pub fn view<'a>() -> Element<'a, Message> {
         .on_press(Message::Open(String::from(env!("CARGO_PKG_REPOSITORY"))))
         .style(theme::Button::HyperlinkInverted);
     let version = centered_text(format!("version: {}", env!("CARGO_PKG_VERSION")));
-    let image = image(xmodits_logo());
+    let image = xmodits_logo();
     let about = centered_container(centered_column_x(column![
         title, version, image, about, repo,
     ]))

diff --git a/src/theme.rs b/src/theme.rs
@@ -370,7 +370,7 @@ impl scrollable::StyleSheet for Theme {
             border_color: Color::TRANSPARENT,
             scroller: scrollable::Scroller {
                 color: d,
-                border_radius: BORDER_RADIUS.into(),
+                border_radius: 3.0.into(),
                 border_width: BORDER_WIDTH,
                 border_color: p.border,
             },
@@ -390,10 +390,15 @@ impl scrollable::StyleSheet for Theme {
         scrollable::Scrollbar {
             scroller: scrollable::Scroller {
                 color: if is_mouse_over_scrollbar {
-                    p.accent
+                    Color { a: 0.5, ..p.accent }
                 } else {
                     self.active(style).scroller.color
                 },
+                border_color: if is_mouse_over_scrollbar {
+                    Color { a: 0.75, ..p.accent }
+                } else {
+                    self.active(style).scroller.border_color
+                },
                 ..self.active(style).scroller
             },
             ..self.active(style)