toggle text

Author: nz366

src/key_bind.rs

@@ -1,6 +1,6 @@
 use cosmic::iced::keyboard::Key;
 use cosmic::iced::keyboard::key::Named;
-use ordered_float::OrderedFloat;
+use ordered_float::OrderedFloat as F;
 use std::collections::HashMap;
 
 use crate::Action;
@@ -33,23 +33,24 @@ pub fn key_binds() -> HashMap<KeyBind, Action> {
     bind!([], Key::Character(",".into()), PreviousFrame);
     bind!([], Key::Character("a".into()), AbRepeat);
     bind!([], Key::Character("m".into()), AudioToggle);
+    bind!([], Key::Character("c".into()), TextCodeToggle);
     bind!([], Key::Named(Named::PageUp), PlayPrev);
     bind!([], Key::Named(Named::PageDown), PlayNext);
-    bind!([], Key::Named(Named::ArrowUp), ChangeVolume(OrderedFloat(0.002)));
-    bind!([], Key::Named(Named::ArrowDown), ChangeVolume(OrderedFloat(-0.002)));
-    bind!([Shift], Key::Character(",".into()), ChangeSpeed(OrderedFloat(-0.25)));
-    bind!([Shift], Key::Character(".".into()), ChangeSpeed(OrderedFloat(0.25)));
+    bind!([], Key::Named(Named::ArrowUp), ChangeVolume(F(0.02)));
+    bind!([], Key::Named(Named::ArrowDown), ChangeVolume(F(-0.02)));
+    bind!([Shift], Key::Character(",".into()), ChangeSpeed(F(-0.25)));
+    bind!([Shift], Key::Character(".".into()), ChangeSpeed(F(0.25)));
 
-    bind!([], Key::Character("0".into()), Seek(OrderedFloat(0.0)));
-    bind!([], Key::Character("1".into()), Seek(OrderedFloat(0.1)));
-    bind!([], Key::Character("2".into()), Seek(OrderedFloat(0.2)));
-    bind!([], Key::Character("3".into()), Seek(OrderedFloat(0.3)));
-    bind!([], Key::Character("4".into()), Seek(OrderedFloat(0.4)));
-    bind!([], Key::Character("5".into()), Seek(OrderedFloat(0.5)));
-    bind!([], Key::Character("6".into()), Seek(OrderedFloat(0.6)));
-    bind!([], Key::Character("7".into()), Seek(OrderedFloat(0.7)));
-    bind!([], Key::Character("8".into()), Seek(OrderedFloat(0.8)));
-    bind!([], Key::Character("9".into()), Seek(OrderedFloat(0.9)));
+    bind!([], Key::Character("0".into()), Seek(F(0.0)));
+    bind!([], Key::Character("1".into()), Seek(F(0.1)));
+    bind!([], Key::Character("2".into()), Seek(F(0.2)));
+    bind!([], Key::Character("3".into()), Seek(F(0.3)));
+    bind!([], Key::Character("4".into()), Seek(F(0.4)));
+    bind!([], Key::Character("5".into()), Seek(F(0.5)));
+    bind!([], Key::Character("6".into()), Seek(F(0.6)));
+    bind!([], Key::Character("7".into()), Seek(F(0.7)));
+    bind!([], Key::Character("8".into()), Seek(F(0.8)));
+    bind!([], Key::Character("9".into()), Seek(F(0.9)));
 
     key_binds
 }

src/main.rs

@@ -189,6 +189,7 @@ pub enum Action {
     PreviousFrame,
     AbRepeat,
     AudioToggle,
+    TextCodeToggle,
     ChangeVolume(OrderedFloat<f64>),
     ChangeSpeed(OrderedFloat<f64>),
     Seek(OrderedFloat<f64>),
@@ -217,11 +218,12 @@ impl MenuAction for Action {
             Self::NextFrame => Message::NextFrame,
             Self::PreviousFrame => Message::PreviousFrame,
             Self::AbRepeat => Message::AbRepeat,
+            Self::TextCodeToggle => Message::TextCodeToggle,
             Self::AudioToggle => Message::AudioToggle,
             Self::WindowClose => Message::WindowClose,
             Self::ChangeVolume(change) => Message::ChangeVolumeRelative(change.into_inner()),
             Self::ChangeSpeed(change) => Message::ChangeSpeedRelative(change.into_inner()),
-            Self::Seek(value) => Message::SeekPercent(value.into_inner())
+            Self::Seek(value) => Message::SeekPercent(value.into_inner()),
         }
     }
 }
@@ -333,6 +335,7 @@ pub enum Message {
     ShowControls,
     SystemThemeModeChange(cosmic_theme::ThemeMode),
     WindowClose,
+    TextCodeToggle,
 }
 
 /// The [`App`] stores application-specific state.
@@ -363,6 +366,7 @@ pub struct App {
     playback_speed: f64,
     #[cfg(feature = "xdg-portal")]
     inhibit: tokio::sync::watch::Sender<bool>,
+    previous_text: Option<i32>,
 }
 
 impl App {
@@ -936,6 +940,7 @@ impl Application for App {
             current_audio: -1,
             text_codes: Vec::new(),
             current_text: None,
+            previous_text: None,
             ab_repeat: None,
             playback_speed: 1.0,
             #[cfg(feature = "xdg-portal")]
@@ -1275,6 +1280,16 @@ impl Application for App {
                     self.update_flags();
                 }
             }
+            Message::TextCodeToggle => {
+                if self.current_text.is_some() {
+                    self.previous_text = self.current_text;
+                    self.current_text = None;
+                } else {
+                    self.current_text = self.previous_text;
+                }
+
+                self.update_flags();
+            }
             Message::Pause | Message::Play | Message::PlayPause => {
                 //TODO: cleanest way to close dropdowns
                 self.dropdown_opt = None;
@@ -1370,14 +1385,15 @@ impl Application for App {
                     video.seek(target, true).expect("seek");
                 }
             }
+
             Message::SeekPercent(float) => {
                 if let Some(video) = &mut self.video_opt {
-                    self.position =
-                        (self.duration * float).clamp(0.0, self.duration);
+                    self.position = (self.duration * float).clamp(0.0, self.duration);
                     let target = Duration::try_from_secs_f64(self.position).unwrap_or_default();
                     video.seek(target, true).expect("seek");
                 }
             }
+
             Message::SeekRelease => {
                 //TODO: cleanest way to close dropdowns
                 self.dropdown_opt = None;
@@ -1538,11 +1554,6 @@ impl Application for App {
                 }
                 self.update_controls(true);
             }
-            Message::ChangeSpeedRelative(float) => {
-                if let Some(video) = self.video_opt.as_ref() {
-                    return self.update(Message::PlaybackSpeed(video.speed() + float));
-                }
-            }
             Message::VideoAreaClick => {
                 if self.dropdown_opt.is_some() {
                     self.dropdown_opt = None;
@@ -1584,6 +1595,12 @@ impl Application for App {
                 }
             }
 
+            Message::ChangeSpeedRelative(float) => {
+                if let Some(video) = self.video_opt.as_ref() {
+                    return self.update(Message::PlaybackSpeed(video.speed() + float));
+                }
+            }
+
             Message::MissingPlugin(element) => {
                 if let Some(video) = &mut self.video_opt {
                     video.set_paused(true);