Make gui scrollable

Author: Tehforsch

src/gui/mod.rs

@@ -6,13 +6,15 @@ use crate::config::Config;
 use crate::recording_session::SessionPath;
 use anyhow::Result;
 use iced::application::application;
-use iced::widget::{button, row};
+use iced::widget::{button, row, scrollable};
 use iced::{Element, Subscription, Task, Theme};
 use log::error;
 
 use self::session_gui::{SessionGui, SessionMessage};
 use self::session_selector::SessionSelector;
 
+const SCROLLBAR_WIDTH: f32 = 20.0;
+
 pub struct Gui {
     session: Option<SessionGui>,
     session_selector: SessionSelector,
@@ -64,15 +66,19 @@ impl Gui {
 
     fn view(&self) -> Element<Message> {
         let selector = self.session_selector.view();
-        let session_view = self
-            .session
-            .as_ref()
-            .map(|session| session.view())
-            .unwrap_or(row![].into())
-            .map(|message| Message::SessionMessage(message));
+        let session_view = scrollable(
+            self.session
+                .as_ref()
+                .map(|session| session.view())
+                .unwrap_or(row![].into())
+                .map(|message| Message::SessionMessage(message)),
+        )
+        .direction(scrollable::Direction::Vertical(
+            scrollable::Scrollbar::new().width(SCROLLBAR_WIDTH),
+        ));
         let cut_songs =
             button("Cut songs").on_press(Message::SessionMessage(SessionMessage::CutSongs));
-        row![session_view, cut_songs, selector].into()
+        row![selector, cut_songs, session_view].into()
     }
 
     fn subscription(&self) -> Subscription<Message> {

src/gui/session_gui.rs

@@ -45,7 +45,6 @@ pub struct SetCutPosition {
 pub struct SessionGui {
     plots: Vec<Plot>,
     reader: Mutex<WavFileReader>,
-    session: RecordingSession,
     path: SessionPath,
     cuts: Manual,
     cutting_state: CuttingState,
@@ -106,7 +105,6 @@ impl SessionGui {
         let cuts = Manual::new(&mut reader, &session.session, DbusLengthsStrategy);
         let playback_state = PlaybackState::Waiting;
         Ok(Self {
-            session: session.session,
             reader: Mutex::new(reader),
             plots,
             cuts,
@@ -143,6 +141,7 @@ impl SessionGui {
         let canvases: Vec<_> = self
             .plots
             .iter()
+            .skip(self.scroll_pos as usize)
             .enumerate()
             .map(|(i, plot)| {
                 let c: Element<PlotMarkerMoved> =
@@ -157,9 +156,11 @@ impl SessionGui {
                     text(song.to_string_short().to_string()).align_x(Horizontal::Left)
                 };
                 let titles = Row::new()
+                    .push(horizontal_space())
                     .push_maybe(plot.song_before().map(make_title))
                     .push(horizontal_space())
-                    .push_maybe(plot.song_after().map(make_title));
+                    .push_maybe(plot.song_after().map(make_title))
+                    .push(horizontal_space());
                 column![titles, canvas].into()
             })
             .collect();