update wave color on theme change

B0ney · Dec 24, 2023 · 2451c0c · 2451c0c
1 parent 9905493
commit 2451c0c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/widget/waveform_view.rs b/src/widget/waveform_view.rs
@@ -1,5 +1,4 @@
 //! Simple Widget to view waveform
-//!
 
 mod marker;
 mod style;
@@ -13,12 +12,11 @@ use iced::mouse::Button;
 use iced::widget::canvas::{self, Renderer as _};
 use iced::window::Action;
 use iced::{keyboard, BorderRadius, Color, Element, Length, Point, Rectangle, Renderer, Vector};
+use std::cell::RefCell;
 
 pub use marker::Marker;
 pub use style::{Appearance, StyleSheet};
-pub use wave::WaveData;
-
-use self::wave::Local;
+pub use wave::{Local, WaveData};
 
 const SCALE: f32 = 1.2;
 const MAX_SCALE: f32 = 10.0;
@@ -206,6 +204,7 @@ struct State {
     wave_id: u64,
     canvas_cache: canvas::Cache,
     waveform: WaveGeometry,
+    wave_color: RefCell<Color>,
 }
 
 impl State {
@@ -253,6 +252,21 @@ impl State {
         self.wave_id = wave.id();
         self.update_zoom(wave);
     }
+
+    // Clear canvas cache if wave colors differ
+    fn update_wave_color(&self, appearance: &Appearance) {
+        use std::ops::DerefMut;
+
+        let new_color = appearance.wave_color;
+
+        match self.wave_color.borrow_mut().deref_mut() {
+            old_color if new_color.ne(&old_color) => {
+                *old_color = new_color;
+                self.canvas_cache.clear();
+            }
+            _ => {}
+        }
+    }
 }
 
 impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for WaveformViewer<'a, Message, Theme>
@@ -354,12 +368,12 @@ where
                             let new_offset = (start_offset - (current_cursor_x - previous_offset)) as usize;
 
                             let wave = &wave.peaks()[0];
-                            
+
                             let wave_len = match state.zoom > 1.0 {
                                 true => (wave.len() as f32 * state.zoom) as usize,
                                 false => wave.len(),
                             };
-                            
+
                             state.wave_offset = wave_len.saturating_sub(1).min(new_offset);
                             state.canvas_cache.clear();
                         }
@@ -476,6 +490,8 @@ where
             .wave
             .and_then(|wavedata| Some((wavedata, state.waveform.get()?)))
         {
+            state.update_wave_color(&appearance);
+
             let waveform = state
                 .canvas_cache
                 .draw(renderer, layout.bounds().size(), |frame| {

diff --git a/src/widget/waveform_view/style.rs b/src/widget/waveform_view/style.rs
@@ -1,7 +1,7 @@
 use iced::{Background, BorderRadius, Color};
 
 /// The appearance of a waveform viewer.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Appearance {
     pub background: Background,
     pub wave_color: Color,