Fix for bug in 33fa7b9

psst-gui/src/controller/nav.rs

@@ -1,7 +1,7 @@
 use crate::{
     cmd,
     data::{AppState, Nav, SpotifyUrl},
-    ui::{album, artist, library, playlist, recommend, search, show},
+    ui::{album, artist, library, lyrics, playlist, recommend, search, show},
 };
 use druid::widget::{prelude::*, Controller};
 
@@ -97,6 +97,19 @@ where
                 ctx.set_handled();
                 self.load_route_data(ctx, data);
             }
+            Event::Command(cmd) if cmd.is(cmd::TOGGLE_LYRICS) => {
+                match data.nav {
+                    Nav::Lyrics => data.navigate_back(),
+                    _ => {
+                        data.navigate(&Nav::Lyrics);
+                        if let Some(np) = data.playback.now_playing.as_ref() {
+                            ctx.submit_command(lyrics::SHOW_LYRICS.with(np.clone()));
+                        }
+                    }
+                }
+                ctx.set_handled();
+                self.load_route_data(ctx, data);
+            }
             Event::MouseDown(cmd) if cmd.button.is_x1() => {
                 data.navigate_back();
                 ctx.set_handled();

psst-gui/src/controller/playback.rs

@@ -452,7 +452,7 @@ where
             }
             Event::Command(cmd) if cmd.is(cmd::SKIP_TO_POSITION) => {
                 let location = cmd.get_unchecked(cmd::SKIP_TO_POSITION);
-                self.seek(Duration::from_millis(location.clone()));
+                self.seek(Duration::from_millis(*location));
 
                 ctx.set_handled();
             }

psst-gui/src/ui/lyrics.rs

@@ -1,8 +1,8 @@
 use druid::widget::{Container, CrossAxisAlignment, Flex, Label, LineBreaking, List, Scroll};
-use druid::{EventCtx, Insets, LensExt, Selector, Widget, WidgetExt};
+use druid::{Insets, LensExt, Selector, Widget, WidgetExt};
 
 use crate::cmd;
-use crate::data::{AppState, Ctx, Nav, NowPlaying, Playable, TrackLines};
+use crate::data::{AppState, Ctx, NowPlaying, Playable, TrackLines};
 use crate::widget::MyWidgetExt;
 use crate::{webapi::WebApi, widget::Async};
 
@@ -25,9 +25,6 @@ pub fn lyrics_widget() -> impl Widget<AppState> {
         .center(),
     )
     .vertical()
-    .on_command(cmd::TOGGLE_LYRICS, |ctx, _, data| {
-        toggle_lyrics(data, ctx);
-    })
 }
 
 fn track_info_widget() -> impl Widget<AppState> {
@@ -95,14 +92,3 @@ fn track_lyrics_widget() -> impl Widget<AppState> {
         |_, data, r| data.lyrics.update(((), r.1)),
     )
 }
-
-pub fn toggle_lyrics(data: &mut AppState, ctx: &mut EventCtx) {
-    if data.nav == Nav::Lyrics {
-        ctx.submit_command(cmd::NAVIGATE_BACK.with(1));
-    } else {
-        if let Some(now_playing) = &data.playback.now_playing {
-            ctx.submit_command(SHOW_LYRICS.with(now_playing.clone()));
-            ctx.submit_command(cmd::NAVIGATE.with(Nav::Lyrics));
-        }
-    }
-}

psst-gui/src/ui/mod.rs

@@ -27,8 +27,8 @@ pub mod artist;
 pub mod episode;
 pub mod find;
 pub mod home;
-pub mod lyrics;
 pub mod library;
+pub mod lyrics;
 pub mod menu;
 pub mod playable;
 pub mod playback;