feat(ui): toast now overlays visuals

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

Author: httpsworldview

src/ui/app.rs

@@ -23,7 +23,7 @@ use crate::visuals::registry::{VisualManager, VisualManagerHandle};
 use async_channel::Receiver as AsyncReceiver;
 use iced::alignment::{Horizontal, Vertical};
 use iced::event::{self, Event};
-use iced::widget::{column, container, mouse_area, row, stack, text};
+use iced::widget::{container, mouse_area, row, stack, text};
 use iced::{
     Element, Length, Settings as IcedSettings, Size, Subscription, Task, daemon as iced_daemon,
     window,
@@ -272,23 +272,24 @@ impl UiApp {
             is_active(self.exit_warning_until).then_some("q again to exit"),
         ];
 
-        let mut layer = column![fill!(visuals_view)]
-            .width(Length::Fill)
-            .height(Length::Fill);
-        if toast_msgs.iter().any(Option::is_some) {
-            layer = layer.push(
-                container(
-                    row(toast_msgs
-                        .into_iter()
-                        .flatten()
-                        .map(|m| container(text(m).size(11)).padding([2, 6]).into()))
-                    .spacing(12),
-                )
-                .width(Length::Fill)
-                .align_x(Horizontal::Center),
-            );
+        let base: Element<'_, Message> = fill!(visuals_view).into();
+        if !toast_msgs.iter().any(Option::is_some) {
+            return base;
         }
-        layer.into()
+        let toast = container(
+            row(toast_msgs
+                .into_iter()
+                .flatten()
+                .map(|m| container(text(m).size(11)).padding([2, 6]).into()))
+            .spacing(12),
+        )
+        .padding([6, 10])
+        .style(theme::weak_container);
+        let overlay = fill!(toast)
+            .padding(8)
+            .align_x(Horizontal::Center)
+            .align_y(Vertical::Bottom);
+        stack![base, overlay].into()
     }
 
     fn wrap_bar_resize<'a>(

src/ui/settings/spectrum.rs

@@ -29,6 +29,11 @@ crate::macros::choice_enum!(no_default all pub(in crate::ui) enum AvgMode {
     PeakHold => "Peak hold",
 });
 
+crate::macros::choice_enum!(no_default all pub(in crate::ui) enum FrequencyDirection {
+    LowToHigh => "Low -> High",
+    HighToLow => "High -> Low",
+});
+
 struct AveragingControls {
     mode: AvgMode,
     factor: f32,
@@ -48,7 +53,10 @@ settings_messages!(pane, value {
     Source(Channel) => set_if_changed(&mut pane.settings.source, value);
     SecondarySource(Channel) => set_if_changed(&mut pane.settings.secondary_source, value);
     FrequencyScale(FrequencyScale) => set_if_changed(&mut pane.settings.frequency_scale, value);
-    ReverseFrequency(bool) => set_if_changed(&mut pane.settings.reverse_frequency, value);
+    FrequencyDirection(FrequencyDirection) => set_if_changed(
+        &mut pane.settings.reverse_frequency,
+        value == FrequencyDirection::HighToLow,
+    );
     DisplayMode(SpectrumDisplayMode) => set_if_changed(&mut pane.settings.display_mode, value);
     WeightingMode(SpectrumWeightingMode) => set_if_changed(&mut pane.settings.weighting_mode, value);
     SecondaryWeightingMode(SpectrumWeightingMode) => set_if_changed(&mut pane.settings.secondary_weighting_mode, value);
@@ -67,10 +75,10 @@ impl Pane {
     pub(super) fn view(&self) -> Element<'_, Message> {
         let s = &self.settings;
         let hop_divisor = get_closest_hop_divisor(s.fft_size, s.hop_size);
-        let dir = if s.reverse_frequency {
-            "High <- Low"
+        let direction = if s.reverse_frequency {
+            FrequencyDirection::HighToLow
         } else {
-            "Low -> High"
+            FrequencyDirection::LowToHigh
         };
 
         let sources = split(
@@ -109,7 +117,12 @@ impl Pane {
             pick("Display", SpectrumDisplayMode::ALL, s.display_mode, Message::DisplayMode);
             split(
                 controls!(8.0;
-                    toggle(dir, s.reverse_frequency, Message::ReverseFrequency);
+                    pick(
+                        "Direction",
+                        FrequencyDirection::ALL,
+                        direction,
+                        Message::FrequencyDirection,
+                    );
                     toggle("Frequency grid", s.show_grid, Message::ShowGrid);
                 ),
                 controls!(8.0;