Merge pull request #68 from devmobasa/pr/configurator-toasts

UI: add configurator toasts and close overlay on config open

Author: devmobasa

src/backend/wayland/state/render.rs

@@ -27,6 +27,7 @@ impl WaylandState {
         let now = Instant::now();
         let highlight_active = self.input_state.advance_click_highlights(now);
         let preset_feedback_active = self.input_state.advance_preset_feedback(now);
+        let ui_toast_active = self.input_state.advance_ui_toast(now);
         let mut eraser_pattern: Option<cairo::SurfacePattern> = None;
         let mut eraser_bg_color: Option<Color> = None;
 
@@ -361,6 +362,7 @@ impl WaylandState {
                     );
                 }
 
+                crate::ui::render_ui_toast(&ctx, &self.input_state, width, height);
                 crate::ui::render_preset_toast(&ctx, &self.input_state, width, height);
 
                 if !self.zoom.active {
@@ -456,6 +458,6 @@ impl WaylandState {
             self.render_toolbars(&snapshot);
         }
 
-        Ok(highlight_active || preset_feedback_active)
+        Ok(highlight_active || preset_feedback_active || ui_toast_active)
     }
 }

src/input/state/core/base.rs

@@ -4,6 +4,7 @@ pub const MIN_STROKE_THICKNESS: f64 = 1.0;
 pub const MAX_STROKE_THICKNESS: f64 = 50.0;
 pub const PRESET_FEEDBACK_DURATION_MS: u64 = 450;
 pub const PRESET_TOAST_DURATION_MS: u64 = 1300;
+pub const UI_TOAST_DURATION_MS: u64 = 5000;
 
 use super::{
     index::SpatialGrid,
@@ -90,12 +91,26 @@ pub enum PresetFeedbackKind {
     Clear,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum UiToastKind {
+    Info,
+    Warning,
+    Error,
+}
+
 #[derive(Debug, Clone)]
 pub(crate) struct PresetFeedbackState {
     pub kind: PresetFeedbackKind,
     pub started: Instant,
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct UiToastState {
+    pub kind: UiToastKind,
+    pub message: String,
+    pub started: Instant,
+}
+
 pub struct InputState {
     /// Multi-frame canvas management (transparent, whiteboard, blackboard)
     pub canvas_set: CanvasSet,
@@ -215,6 +230,8 @@ pub struct InputState {
     pub show_marker_opacity_section: bool,
     /// Whether to show preset action toast notifications
     pub show_preset_toasts: bool,
+    /// Pending UI toast (errors/warnings/info)
+    pub(crate) ui_toast: Option<UiToastState>,
     /// Pending delayed history playback state
     pub(super) pending_history: Option<DelayedHistory>,
     /// Cached layout details for the currently open context menu
@@ -385,6 +402,7 @@ impl InputState {
             show_delay_sliders: false, // Default to hidden
             show_marker_opacity_section: false,
             show_preset_toasts: true,
+            ui_toast: None,
             pending_history: None,
             context_menu_layout: None,
             spatial_index: None,

src/input/state/core/mod.rs

@@ -12,8 +12,9 @@ mod tool_controls;
 mod utility;
 
 pub use base::{
-    DrawingState, InputState, PresetAction, PresetFeedbackKind, PRESET_FEEDBACK_DURATION_MS,
-    PRESET_TOAST_DURATION_MS, MAX_STROKE_THICKNESS, MIN_STROKE_THICKNESS, ZoomAction,
+    DrawingState, InputState, PresetAction, PresetFeedbackKind, UiToastKind,
+    PRESET_FEEDBACK_DURATION_MS, PRESET_TOAST_DURATION_MS, UI_TOAST_DURATION_MS,
+    MAX_STROKE_THICKNESS, MIN_STROKE_THICKNESS, ZoomAction,
 };
 #[allow(unused_imports)]
 pub use menus::{ContextMenuEntry, ContextMenuKind, ContextMenuState, MenuCommand};

src/input/state/core/utility.rs

@@ -1,9 +1,12 @@
-use super::base::{InputState, PresetAction, ZoomAction};
+use super::base::{
+    InputState, PresetAction, UiToastKind, UiToastState, ZoomAction, UI_TOAST_DURATION_MS,
+};
 use crate::config::Action;
 use crate::config::Config;
 use crate::util::Rect;
 use std::io::ErrorKind;
 use std::process::{Command, Stdio};
+use std::time::{Duration, Instant};
 
 impl InputState {
     /// Updates the cached pointer location.
@@ -138,7 +141,7 @@ impl InputState {
         self.zoom_scale
     }
 
-    pub(crate) fn launch_configurator(&self) {
+    pub(crate) fn launch_configurator(&mut self) {
         let binary = std::env::var("WAYSCRIBER_CONFIGURATOR")
             .unwrap_or_else(|_| "wayscriber-configurator".to_string());
 
@@ -153,24 +156,54 @@ impl InputState {
                     "Launched wayscriber-configurator (binary: {binary}, pid: {})",
                     child.id()
                 );
+                self.should_exit = true;
             }
             Err(err) => {
                 if err.kind() == ErrorKind::NotFound {
                     log::error!(
                         "Configurator not found (looked for '{binary}'). Install 'wayscriber-configurator' (Arch: yay -S wayscriber-configurator; deb/rpm users: grab the wayscriber-configurator package from the release page) or set WAYSCRIBER_CONFIGURATOR to its path."
                     );
+                    self.set_ui_toast(
+                        UiToastKind::Warning,
+                        format!("Configurator not found: {binary}"),
+                    );
                 } else {
                     log::error!("Failed to launch wayscriber-configurator using '{binary}': {err}");
                     log::error!(
                         "Set WAYSCRIBER_CONFIGURATOR to override the executable path if needed."
                     );
+                    self.set_ui_toast(
+                        UiToastKind::Error,
+                        "Failed to launch configurator (see logs).",
+                    );
                 }
             }
         }
     }
 
+    pub(crate) fn set_ui_toast(&mut self, kind: UiToastKind, message: impl Into<String>) {
+        self.ui_toast = Some(UiToastState {
+            kind,
+            message: message.into(),
+            started: Instant::now(),
+        });
+        self.needs_redraw = true;
+    }
+
+    pub fn advance_ui_toast(&mut self, now: Instant) -> bool {
+        let duration = Duration::from_millis(UI_TOAST_DURATION_MS);
+        let Some(toast) = &self.ui_toast else {
+            return false;
+        };
+        if now.saturating_duration_since(toast.started) >= duration {
+            self.ui_toast = None;
+            return false;
+        }
+        true
+    }
+
     /// Opens the primary config file using the desktop default application.
-    pub(crate) fn open_config_file_default(&self) {
+    pub(crate) fn open_config_file_default(&mut self) {
         let path = match Config::get_config_path() {
             Ok(p) => p,
             Err(err) => {
@@ -201,6 +234,7 @@ impl InputState {
                     path.display(),
                     child.id()
                 );
+                self.should_exit = true;
             }
             Err(err) => {
                 log::error!("Failed to open config file at {}: {}", path.display(), err);

src/input/state/mod.rs

@@ -9,7 +9,7 @@ mod tests;
 #[allow(unused_imports)]
 pub use core::{
     ContextMenuEntry, ContextMenuKind, ContextMenuState, DrawingState, InputState, PresetAction,
-    PresetFeedbackKind, PRESET_FEEDBACK_DURATION_MS, PRESET_TOAST_DURATION_MS,
-    MAX_STROKE_THICKNESS, MIN_STROKE_THICKNESS, SelectionState, ZoomAction,
+    PresetFeedbackKind, UiToastKind, PRESET_FEEDBACK_DURATION_MS, PRESET_TOAST_DURATION_MS,
+    UI_TOAST_DURATION_MS, MAX_STROKE_THICKNESS, MIN_STROKE_THICKNESS, SelectionState, ZoomAction,
 };
 pub use highlight::ClickHighlightSettings;

src/ui.rs

@@ -3,7 +3,9 @@ pub mod toolbar;
 /// UI rendering: status bar, help overlay, visual indicators
 use crate::config::StatusPosition;
 use crate::input::{BoardMode, DrawingState, InputState, Tool, state::ContextMenuState};
-use crate::input::state::{PresetFeedbackKind, PRESET_TOAST_DURATION_MS};
+use crate::input::state::{
+    PresetFeedbackKind, UiToastKind, PRESET_TOAST_DURATION_MS, UI_TOAST_DURATION_MS,
+};
 use std::f64::consts::{FRAC_PI_2, PI};
 use std::time::Instant;
 
@@ -21,6 +23,10 @@ const STATUS_BG_WIDTH_PAD: f64 = 10.0;
 const STATUS_BG_HEIGHT_PAD: f64 = 8.0;
 /// Color indicator dot X offset
 const STATUS_DOT_OFFSET_X: f64 = 3.0;
+/// Vertical position for UI toasts (percentage of screen height from top)
+const UI_TOAST_Y_RATIO: f64 = 0.12;
+/// Portion of toast lifetime to keep fully opaque before fading
+const UI_TOAST_HOLD_RATIO: f64 = 0.75;
 /// Vertical position for preset toast (percentage of screen height from top)
 const PRESET_TOAST_Y_RATIO: f64 = 0.2;
 
@@ -281,7 +287,7 @@ pub fn render_zoom_badge(
     };
     let padding = 12.0;
     let radius = 8.0;
-    let font_size = 15.0;
+    let font_size = 16.0;
 
     ctx.select_font_face("Sans", cairo::FontSlant::Normal, cairo::FontWeight::Bold);
     ctx.set_font_size(font_size);
@@ -362,7 +368,12 @@ pub fn render_preset_toast(
     let center_y = screen_height as f64 * PRESET_TOAST_Y_RATIO;
     let y = center_y - height / 2.0;
 
-    let fade = (1.0 - progress as f64).clamp(0.0, 1.0);
+    let fade = if (progress as f64) <= UI_TOAST_HOLD_RATIO {
+        1.0
+    } else {
+        let t = ((progress as f64) - UI_TOAST_HOLD_RATIO) / (1.0 - UI_TOAST_HOLD_RATIO);
+        (1.0 - t).clamp(0.0, 1.0)
+    };
     let (r, g, b) = match kind {
         PresetFeedbackKind::Apply => (0.22, 0.5, 0.9),
         PresetFeedbackKind::Save => (0.2, 0.7, 0.4),
@@ -380,6 +391,66 @@ pub fn render_preset_toast(
     let _ = ctx.show_text(&label);
 }
 
+/// Render a transient UI toast (warnings/errors/info).
+pub fn render_ui_toast(
+    ctx: &cairo::Context,
+    input_state: &InputState,
+    screen_width: u32,
+    screen_height: u32,
+) {
+    let Some(toast) = input_state.ui_toast.as_ref() else {
+        return;
+    };
+
+    let now = Instant::now();
+    let duration_secs = UI_TOAST_DURATION_MS as f32 / 1000.0;
+    let elapsed = now.saturating_duration_since(toast.started);
+    let progress = (elapsed.as_secs_f32() / duration_secs).clamp(0.0, 1.0);
+    if progress >= 1.0 {
+        return;
+    }
+
+    let label = toast.message.as_str();
+    let font_size = 15.0;
+    let padding_x = 16.0;
+    let padding_y = 9.0;
+    let radius = 10.0;
+
+    let extents = text_extents_for(
+        ctx,
+        "Sans",
+        cairo::FontSlant::Normal,
+        cairo::FontWeight::Bold,
+        font_size,
+        label,
+    );
+    let width = extents.width() + padding_x * 2.0;
+    let height = extents.height() + padding_y * 2.0;
+    let x = (screen_width as f64 - width) / 2.0;
+    let center_y = screen_height as f64 * UI_TOAST_Y_RATIO;
+    let y = center_y - height / 2.0;
+
+    let fade = (1.0 - progress as f64).clamp(0.0, 1.0);
+    let (r, g, b) = match toast.kind {
+        UiToastKind::Info => (0.22, 0.5, 0.9),
+        UiToastKind::Warning => (0.92, 0.62, 0.18),
+        UiToastKind::Error => (0.9, 0.3, 0.3),
+    };
+
+    ctx.set_source_rgba(r, g, b, 0.92 * fade);
+    draw_rounded_rect(ctx, x, y, width, height, radius);
+    let _ = ctx.fill();
+
+    let text_x = x + (width - extents.width()) / 2.0 - extents.x_bearing();
+    let text_y = y + (height - extents.height()) / 2.0 - extents.y_bearing();
+    ctx.set_source_rgba(0.0, 0.0, 0.0, 0.55 * fade);
+    ctx.move_to(text_x + 1.0, text_y + 1.0);
+    let _ = ctx.show_text(label);
+    ctx.set_source_rgba(1.0, 1.0, 1.0, 1.0 * fade);
+    ctx.move_to(text_x, text_y);
+    let _ = ctx.show_text(label);
+}
+
 /// Render help overlay showing all keybindings
 pub fn render_help_overlay(
     ctx: &cairo::Context,