gui is lookin better (shoutout #34), and bulletproofing the player ev…

…en more!
nednoodlehead · Jun 3, 2024 · 8c00973 · 8c00973
1 parent fa63106
commit 8c00973
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 21 deletions.
diff --git a/src/gui/messages.rs b/src/gui/messages.rs
@@ -134,7 +134,8 @@ pub enum Context {
     PlayPause,
     SkippedForward,
     SkippedBackwards,
-    Seeked,
+    SkippedTo, // skipping to the seconds part
+    Seeked,    // searching for a song!
     AutoPlay,
 }
 

diff --git a/src/gui/persistent.rs b/src/gui/persistent.rs
@@ -170,13 +170,13 @@ impl App {
             })
             .collect();
         btn.push(row![text("  "), menu].into()); // the stupid button clips over the container border. so add this so it doesnt ...
-        btn.push(self.separator().into()); // separater between buttons and playlists :)
+        btn.push(self.horizontal_separator().into()); // separater between buttons and playlists :)
         btn.extend(playlist_buttons);
-        container(Column::with_children(btn).spacing(5))
+        container(row![Column::with_children(btn), self.vertical_separator()].spacing(5))
             .height(Length::Fill)
-            .style(iced::theme::Container::Custom(Box::new(
-                ContainerWithBorder,
-            )))
+            // .style(iced::theme::Container::Custom(Box::new(
+            //     ContainerWithBorder,
+            // )))
             .into()
     }
     // pub fn render_search_result_box(
@@ -192,19 +192,33 @@ impl App {
     //     // also downloads the images. they should be flushed on each search
     //     container()
     // }
-    fn separator(&self) -> quad::Quad {
-        let mut quader = quad::Quad {
+    fn horizontal_separator(&self) -> quad::Quad {
+        quad::Quad {
             quad_color: Color::from([0.5; 3]).into(),
             quad_border: Border {
                 radius: [3.0; 4].into(),
                 ..Default::default()
             },
             inner_bounds: InnerBounds::Ratio(0.98, 0.2),
             height: Length::Fixed(20.0),
+            width: Length::Fixed(140.0),
             ..Default::default()
-        };
+        }
+        // is this like the only way to set it ..?
+    }
+
+    pub fn vertical_separator(&self) -> quad::Quad {
+        quad::Quad {
+            quad_color: Color::from([0.5; 3]).into(),
+            quad_border: Border {
+                radius: [3.0; 4].into(),
+                ..Default::default()
+            },
+            inner_bounds: InnerBounds::Ratio(1.0, 1.0),
+            height: Length::Fill,
+            width: Length::Fixed(4.0),
+            ..Default::default()
+        }
         // is this like the only way to set it ..?
-        quader.width = Length::Fixed(150.0);
-        quader
     }
 }
diff --git a/src/gui/start.rs b/src/gui/start.rs
@@ -207,7 +207,7 @@ impl Application for App {
                 match &data.context {
                     &Context::Default => {}
                     &Context::PlayPause => {}
-                    &Context::Seeked => {}
+                    &Context::SkippedTo => {}
 
                     _ => {
                         println!("resetting scrubber to 0");
@@ -1023,10 +1023,6 @@ impl Application for App {
                 // playlist data
                 text(active_playlist.title).size(35),
                 text(active_playlist.description),
-                horizontal_space(),
-                button(text("Toggle table"))
-                    .style(iced::theme::Button::Custom(Box::new(JustText)))
-                    .on_press(ProgramCommands::ToggleList)
             ]
             .padding(5)
             .align_items(iced_core::Alignment::End)

diff --git a/src/gui/subscription.rs b/src/gui/subscription.rs
@@ -246,7 +246,6 @@ impl App {
                             music_obj.sink.set_volume((val as f32) / 80.0)
                         }
                         PungeCommand::ChangeSong(uuid) => {
-                            println!("here?");
                             let index = music_obj
                                 .list
                                 .iter()
@@ -310,7 +309,7 @@ impl App {
                                     shuffle: music_obj.shuffle,
                                     playlist: music_obj.playlist.clone(),
                                     threshold: music_obj.current_object.threshold,
-                                    context: Context::Seeked,
+                                    context: Context::SkippedTo,
                                     length: music_obj.current_object.length,
                                 }))
                                 .await
@@ -543,7 +542,7 @@ impl App {
                                                     shuffle: music_obj.shuffle,
                                                     playlist: music_obj.playlist.clone(),
                                                     threshold: music_obj.current_object.threshold,
-                                                    context: Context::Seeked,
+                                                    context: Context::SkippedTo,
                                                     length: music_obj.current_object.length,
                                                 }))
                                                 .await

diff --git a/src/gui/table.rs b/src/gui/table.rs
@@ -40,10 +40,10 @@ impl<'a> table::Column<'a, ProgramCommands, Theme, Renderer> for Column {
             ColumnKind::Author => text("Author").into(),
             ColumnKind::Title => text("Title").into(),
             ColumnKind::Album => text("Album").into(),
-            ColumnKind::Edit => button(text("edit").size(10))
+            ColumnKind::Edit => button(text("tog").size(10))
                 .width(100)
                 .height(100)
-                .on_press(ProgramCommands::OpenSongEditPage)
+                .on_press(ProgramCommands::ToggleList)
                 .into(),
         };