improv: allow overrides for corner radius or blur that apply on creation as well

src/surface/action.rs

@@ -5,7 +5,9 @@ use super::Action;
 #[cfg(feature = "winit")]
 use crate::Application;
 
-use iced::window;
+use iced::{Rectangle, window};
+#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+use iced_runtime::platform_specific::wayland::CornerRadius;
 use std::any::Any;
 use std::sync::Arc;
 
@@ -34,18 +36,30 @@ pub fn destroy_layer_shell(id: iced_core::window::Id) -> Action {
     Action::DestroyLayerShell(id)
 }
 
+#[derive(Debug, Default, Copy, Clone)]
+pub struct LiveSettings {
+    #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+    /// Override the default corner radius value for the surface type.
+    pub corners: Option<CornerRadius>,
+    /// Override the default blur setting for the surface type.
+    pub blur: Option<bool>,
+}
+
+type BoxedView<App> = Option<
+    Box<
+        dyn Fn(&App) -> crate::Element<'_, crate::Action<<App as Application>::Message>>
+            + Send
+            + Sync
+            + 'static,
+    >,
+>;
+
 #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
 #[must_use]
 pub fn app_window<App: Application>(
+    live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static,
     settings: impl Fn(&mut App) -> window::Settings + Send + Sync + 'static,
-    view: Option<
-        Box<
-            dyn for<'a> Fn(&'a App) -> crate::Element<'a, crate::Action<App::Message>>
-                + Send
-                + Sync
-                + 'static,
-        >,
-    >,
+    view: BoxedView<App>,
 ) -> (window::Id, Action) {
     let id = window::Id::unique();
 
@@ -53,11 +67,16 @@ pub fn app_window<App: Application>(
         Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
+    let boxed_live: Box<dyn Fn(&App) -> LiveSettings + Send + Sync + 'static> =
+        Box::new(live_settings);
+    let boxed_live: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed_live);
+
     (
         id,
         Action::AppWindow(
             id,
             Arc::new(boxed),
+            Arc::new(boxed_live),
             view.map(|view| {
                 let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(view);
                 Arc::new(boxed)
@@ -70,6 +89,7 @@ pub fn app_window<App: Application>(
 #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
 #[must_use]
 pub fn simple_window<Message: 'static>(
+    live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
     settings: impl Fn() -> window::Settings + Send + Sync + 'static,
     view: Option<
         impl Fn() -> crate::Element<'static, crate::Action<Message>> + Send + Sync + 'static,
@@ -80,11 +100,15 @@ pub fn simple_window<Message: 'static>(
     let boxed: Box<dyn Fn() -> window::Settings + Send + Sync + 'static> = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
+    let boxed_live: Box<dyn Fn() -> LiveSettings + Send + Sync + 'static> = Box::new(live_settings);
+    let boxed_live: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed_live);
+
     (
         id,
         Action::Window(
             id,
             Arc::new(boxed),
+            Arc::new(boxed_live),
             view.map(|view| {
                 let boxed: Box<
                     dyn Fn() -> crate::Element<'static, crate::Action<Message>>
@@ -102,18 +126,12 @@ pub fn simple_window<Message: 'static>(
 #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
 #[must_use]
 pub fn app_popup<App: Application>(
+    live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static,
     settings: impl Fn(&mut App) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
     + Send
     + Sync
     + 'static,
-    view: Option<
-        Box<
-            dyn for<'a> Fn(&'a App) -> crate::Element<'a, crate::Action<App::Message>>
-                + Send
-                + Sync
-                + 'static,
-        >,
-    >,
+    view: BoxedView<App>,
 ) -> Action {
     let boxed: Box<
         dyn Fn(&mut App) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
@@ -123,8 +141,13 @@ pub fn app_popup<App: Application>(
     > = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
+    let boxed_live: Box<dyn Fn(&App) -> LiveSettings + Send + Sync + 'static> =
+        Box::new(live_settings);
+    let boxed_live: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed_live);
+
     Action::AppPopup(
         Arc::new(boxed),
+        Arc::new(boxed_live),
         view.map(|view| {
             let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(view);
             Arc::new(boxed)
@@ -154,6 +177,7 @@ pub fn simple_subsurface<Message: 'static, V>(
 
     Action::Subsurface(
         Arc::new(boxed),
+        Arc::new(Box::new(LiveSettings::default)),
         view.map(|view| {
             let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(view);
             Arc::new(boxed)
@@ -165,6 +189,7 @@ pub fn simple_subsurface<Message: 'static, V>(
 #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
 #[must_use]
 pub fn simple_popup<Message: 'static>(
+    live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
     settings: impl Fn() -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
     + Send
     + Sync
@@ -181,8 +206,12 @@ pub fn simple_popup<Message: 'static>(
     > = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
+    let boxed_live: Box<dyn Fn() -> LiveSettings + Send + Sync + 'static> = Box::new(live_settings);
+    let boxed_live: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed_live);
+
     Action::Popup(
         Arc::new(boxed),
+        Arc::new(boxed_live),
         view.map(|view| {
             let boxed: Box<
                 dyn Fn() -> crate::Element<'static, crate::Action<Message>> + Send + Sync + 'static,
@@ -204,14 +233,7 @@ pub fn subsurface<App: Application>(
     + Sync
     + 'static,
     // XXX Boxed trait object is required for less cumbersome type inference, but we box it anyways.
-    view: Option<
-        Box<
-            dyn for<'a> Fn(&'a App) -> crate::Element<'a, crate::Action<App::Message>>
-                + Send
-                + Sync
-                + 'static,
-        >,
-    >,
+    view: BoxedView<App>,
 ) -> Action {
     let boxed: Box<
         dyn Fn(
@@ -226,6 +248,7 @@ pub fn subsurface<App: Application>(
 
     Action::AppSubsurface(
         Arc::new(boxed),
+        Arc::new(Box::new(|_: &App| LiveSettings::default())),
         view.map(|view| {
             let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(view);
             Arc::new(boxed)
@@ -236,6 +259,7 @@ pub fn subsurface<App: Application>(
 #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
 #[must_use]
 pub fn simple_layer_shell<Message: 'static>(
+    live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
     settings: impl Fn()
         -> iced_runtime::platform_specific::wayland::layer_surface::SctkLayerSurfaceSettings
     + Send
@@ -253,9 +277,11 @@ pub fn simple_layer_shell<Message: 'static>(
             + 'static,
     > = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
-
+    let boxed_live: Box<dyn Fn() -> LiveSettings + Send + Sync + 'static> = Box::new(live_settings);
+    let boxed_live: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed_live);
     Action::LayerShell(
         Arc::new(boxed),
+        Arc::new(boxed_live),
         view.map(|view| {
             let boxed: Box<
                 dyn Fn() -> crate::Element<'static, crate::Action<Message>> + Send + Sync + 'static,
@@ -268,7 +294,8 @@ pub fn simple_layer_shell<Message: 'static>(
 
 #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
 #[must_use]
-pub fn layer_shell<App: Application>(
+pub fn app_layer_shell<App: Application>(
+    live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static,
     settings: impl Fn(
         &mut App,
     )
@@ -277,14 +304,7 @@ pub fn layer_shell<App: Application>(
     + Sync
     + 'static,
     // XXX Boxed trait object is required for less cumbersome type inference, but we box it anyways.
-    view: Option<
-        Box<
-            dyn for<'a> Fn(&'a App) -> crate::Element<'a, crate::Action<App::Message>>
-                + Send
-                + Sync
-                + 'static,
-        >,
-    >,
+    view: BoxedView<App>,
 ) -> Action {
     let boxed: Box<
         dyn Fn(
@@ -297,8 +317,13 @@ pub fn layer_shell<App: Application>(
     > = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
+    let boxed_live: Box<dyn Fn(&App) -> LiveSettings + Send + Sync + 'static> =
+        Box::new(live_settings);
+    let boxed_live: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed_live);
+
     Action::AppLayerShell(
         Arc::new(boxed),
+        Arc::new(boxed_live),
         view.map(|view| {
             let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(view);
             Arc::new(boxed)