refactor(ui): simplify pane/grid internals and tighten invariants

Signed-off-by: Maika Namuo <httpworldview@gmail.com>

Author: httpsworldview

src/infra/pipewire/registry/runtime.rs

@@ -79,7 +79,7 @@ impl AudioRegistryHandle {
         self.runtime.subscribe()
     }
 
-    pub fn send_command(&self, command: RegistryCommand) -> bool {
+    fn send_command(&self, command: RegistryCommand) -> bool {
         self.runtime.send_command(command)
     }
 

src/ui/app/windowing.rs

@@ -268,11 +268,9 @@ impl UiApp {
             .for_each(|popout| popout.sync_from_snapshot(&snapshot));
         let stale_windows: Vec<_> = self
             .popout_windows
-            .iter()
-            .filter_map(|(id, popout)| popout.cached.is_none().then_some(*id))
+            .extract_if(|_, popout| popout.cached.is_none())
+            .map(|(id, _)| id)
             .collect();
-        self.popout_windows
-            .retain(|_, popout| popout.cached.is_some());
         self.visuals_page
             .apply_snapshot_excluding(&snapshot, &self.popped_out_ids());
         Task::batch(

src/ui/pages/visuals.rs

@@ -159,7 +159,7 @@ impl VisualsPage {
                 .map(|(_, p)| p.id)
                 .ne(slots.iter().map(|s| s.id))
         }) {
-            self.panes = self.build_panes(&slots);
+            self.panes = Some(self.build_panes(&slots));
             self.hovered_pane = None;
             return;
         }
@@ -190,7 +190,7 @@ impl VisualsPage {
             .collect()
     }
 
-    fn build_panes(&self, slots: &[&VisualSlotSnapshot]) -> Option<pane_grid::State<VisualPane>> {
+    fn build_panes(&self, slots: &[&VisualSlotSnapshot]) -> pane_grid::State<VisualPane> {
         let settings = self.settings.borrow();
         let saved_width_basis = &settings.data.visuals.width_basis;
         pane_grid::State::from_iter(slots.iter().map(|&slot| {

src/ui/pages/visuals/settings/palette.rs

@@ -5,8 +5,8 @@ use super::widgets::clipped_text;
 use crate::ui::theme::{self, Palette};
 use crate::ui::widgets::{scroll_delta_lines, scroll_glow::ScrollGlow};
 use crate::util::color::{
-    EPSILON, colors_equal, f32_to_u8, find_segment, lerp_color, sanitize_stop_positions,
-    sanitize_stop_spreads, with_alpha,
+    EPSILON, STOP_SPREAD_MAX, STOP_SPREAD_MIN, colors_equal, f32_to_u8, find_segment, lerp_color,
+    sanitize_stop_positions, sanitize_stop_spreads, with_alpha,
 };
 use iced::advanced::renderer::{self, Quad};
 use iced::advanced::widget::{Tree, tree};
@@ -19,8 +19,6 @@ const SWATCH_SIZE: (f32, f32) = (56.0, 28.0);
 const GRADIENT_BAR_HEIGHT: f32 = 24.0;
 const MARKER_HEIGHT: f32 = 8.0;
 const MIN_STOP_GAP: f32 = 0.01;
-const MIN_SPREAD: f32 = 0.2;
-const MAX_SPREAD: f32 = 5.0;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum PaletteEvent {
@@ -155,7 +153,7 @@ impl PaletteEditor {
                 if index >= self.palette.len() {
                     return false;
                 }
-                let next = spread.clamp(MIN_SPREAD, MAX_SPREAD);
+                let next = spread.clamp(STOP_SPREAD_MIN, STOP_SPREAD_MAX);
                 if (self.spreads[index] - next).abs() < EPSILON {
                     return false;
                 }
@@ -419,7 +417,7 @@ impl Widget<PaletteEvent, iced::Theme, iced::Renderer> for GradientBar<'_> {
                 {
                     let dy = scroll_delta_lines(*delta);
                     let current = self.spreads.get(i).copied().unwrap_or(1.0);
-                    let new_spread = (current + dy * 0.2).clamp(MIN_SPREAD, MAX_SPREAD);
+                    let new_spread = (current + dy * 0.2).clamp(STOP_SPREAD_MIN, STOP_SPREAD_MAX);
                     if (current - new_spread).abs() >= EPSILON {
                         shell.publish(PaletteEvent::AdjustSpread {
                             index: i,

src/ui/theme.rs

@@ -19,7 +19,7 @@ const TEXT_DARK: Color = Color::from_rgba(0.10, 0.10, 0.10, 1.0);
 pub const BORDER_SUBTLE: Color = Color::from_rgba(0.280, 0.288, 0.304, 1.0);
 const BORDER_FOCUS: Color = Color::from_rgba(0.520, 0.536, 0.560, 1.0);
 
-const ACCENT_PRIMARY: Color = Color::from_rgba(0.157, 0.157, 0.157, 1.0);
+pub(crate) const ACCENT_PRIMARY: Color = Color::from_rgba(0.157, 0.157, 0.157, 1.0);
 const ACCENT_SUCCESS: Color = Color::from_rgba(0.478, 0.557, 0.502, 1.0);
 const ACCENT_DANGER: Color = Color::from_rgba(0.557, 0.478, 0.478, 1.0);
 
@@ -65,7 +65,7 @@ pub fn focus_border() -> Border {
     border(BORDER_FOCUS)
 }
 
-pub fn button_style(theme: &Theme, base: Color, status: button::Status) -> button::Style {
+fn button_style(theme: &Theme, base: Color, status: button::Status) -> button::Style {
     use button::Status::{Hovered, Pressed};
     let bg = if status == Hovered {
         palette::deviate(base, 0.05)
@@ -142,10 +142,6 @@ pub fn resize_overlay(theme: &Theme) -> container::Style {
     }
 }
 
-pub fn accent_primary() -> Color {
-    ACCENT_PRIMARY
-}
-
 pub fn slider_style(theme: &Theme, status: slider::Status) -> slider::Style {
     let palette = theme.extended_palette();
 

src/ui/widgets/pane_grid.rs

@@ -18,13 +18,13 @@ pub struct State<T> {
 }
 
 impl<T> State<T> {
-    pub fn from_iter(items: impl IntoIterator<Item = T>) -> Option<Self> {
+    pub fn from_iter(items: impl IntoIterator<Item = T>) -> Self {
         let panes = items
             .into_iter()
             .enumerate()
             .map(|(id, item)| (Pane(id), item))
-            .collect::<Vec<_>>();
-        (!panes.is_empty()).then_some(Self { panes })
+            .collect();
+        Self { panes }
     }
 
     pub fn get(&self, pane: Pane) -> Option<&T> {
@@ -452,7 +452,7 @@ where
                 );
             });
             if interaction.dragging.is_some_and(|(p, _)| p == *pane) {
-                let accent = crate::ui::theme::accent_primary();
+                let accent = crate::ui::theme::ACCENT_PRIMARY;
                 renderer.fill_quad(
                     Quad {
                         bounds: child_layout.bounds(),
@@ -482,7 +482,7 @@ where
                     shadow: Default::default(),
                     snap: true,
                 },
-                Background::Color(with_alpha(crate::ui::theme::accent_primary(), 0.75)),
+                Background::Color(with_alpha(crate::ui::theme::ACCENT_PRIMARY, 0.75)),
             );
         }
     }

src/util/color.rs

@@ -4,6 +4,8 @@
 use iced::Color;
 
 pub const EPSILON: f32 = 1e-4;
+pub const STOP_SPREAD_MIN: f32 = 0.2;
+pub const STOP_SPREAD_MAX: f32 = 5.0;
 
 pub fn f32_to_u8(v: f32) -> u8 {
     (v.clamp(0.0, 1.0) * 255.0).round() as u8
@@ -116,7 +118,7 @@ pub fn sanitize_stop_spreads(raw: Option<&[f32]>, count: usize) -> Vec<f32> {
     };
     for (dst, &value) in out.iter_mut().zip(raw.iter()) {
         *dst = if value.is_finite() {
-            value.clamp(0.2, 5.0)
+            value.clamp(STOP_SPREAD_MIN, STOP_SPREAD_MAX)
         } else {
             1.0
         };

src/visuals/spectrum/processor.rs

@@ -223,14 +223,7 @@ impl SpectrumProcessor {
         let floor = self.config.floor_db;
         let mut produced = false;
 
-        if self.a_weighting_db.len() != bins {
-            self.a_weighting_db = self
-                .snapshot
-                .frequency_bins
-                .iter()
-                .map(|&f| a_weight(f))
-                .collect();
-        }
+        debug_assert_eq!(self.a_weighting_db.len(), bins);
 
         while self.pcm_buffer.len() >= fft_size {
             copy_dc_removed_from_deque(&mut self.real_buffer[..fft_size], &self.pcm_buffer);