From 9e9ae942c4fca245b17d0279c96d3625f3fcbf90 Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Thu, 2 Jul 2026 19:00:00 +0200 Subject: [PATCH] yoda: absorb upstream theme-v2 integration debt post-rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - degate 'feature = "winit"' cfgs added by upstream (fork policy: winit toujours actif, le stub Cargo reste vide) - cards.rs: restore 'id' param consumed by upstream's new struct init - iced submodule rebased onto upstream c781ff61 (wgpu 28, cryoglyph) - Cargo.lock regenerated against local path deps Leyoda 2026 – GPLv3 --- src/app/cosmic.rs | 17 ++++++++--------- src/app/mod.rs | 1 - src/core.rs | 1 - src/surface/action.rs | 4 ++-- src/surface/mod.rs | 1 - src/widget/cards.rs | 2 +- src/widget/menu/menu_bar.rs | 1 - src/widget/nav_bar.rs | 1 - src/widget/segmented_button/widget.rs | 11 +---------- 9 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs index 6de7f35b..49013312 100644 --- a/src/app/cosmic.rs +++ b/src/app/cosmic.rs @@ -23,7 +23,6 @@ use iced::Application as IcedApplication; use iced::event::wayland; use iced::{Task, theme, window}; use iced_futures::event::listen_with; -#[cfg(feature = "winit")] use iced_winit::SurfaceIdWrapper; use palette::color_difference::EuclideanDistance; @@ -1568,7 +1567,7 @@ impl Cosmic { if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) { window::enable_blur(id) } else { - #[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] + #[cfg(all(feature = "wayland", target_os = "linux"))] { iced_winit::commands::blur::blur( id, @@ -1579,7 +1578,7 @@ impl Cosmic { ) .discard() } - #[cfg(not(all(feature = "wayland", feature = "winit", target_os = "linux")))] + #[cfg(not(all(feature = "wayland", target_os = "linux")))] { iced::window::enable_blur(id) } @@ -1587,11 +1586,11 @@ impl Cosmic { } else if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) { window::disable_blur(id) } else { - #[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] + #[cfg(all(feature = "wayland", target_os = "linux"))] { iced_winit::commands::blur::blur(id, None).discard() } - #[cfg(not(all(feature = "wayland", feature = "winit", target_os = "linux")))] + #[cfg(not(all(feature = "wayland", target_os = "linux")))] { iced::window::disable_blur(id) } @@ -1601,7 +1600,7 @@ impl Cosmic { cmds.push(if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) { window::enable_blur(id) } else { - #[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] + #[cfg(all(feature = "wayland", target_os = "linux"))] { iced_winit::commands::blur::blur( id, @@ -1612,13 +1611,13 @@ impl Cosmic { ) .discard() } - #[cfg(not(all(feature = "wayland", feature = "winit", target_os = "linux")))] + #[cfg(not(all(feature = "wayland", target_os = "linux")))] { iced::window::enable_blur(id) } }); } - #[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] + #[cfg(all(feature = "wayland", target_os = "linux"))] if let Some(corners) = live_settings.corners { cmds.push( iced_winit::commands::corner_radius::corner_radius(id, Some(corners)).discard(), @@ -1634,7 +1633,7 @@ impl Cosmic { ); } } - #[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] + #[cfg(all(feature = "wayland", target_os = "linux"))] if let (SurfaceIdWrapper::LayerSurface(id), Some(padding)) = (id_wrapper, live_settings.padding) { diff --git a/src/app/mod.rs b/src/app/mod.rs index 8ddc82d1..bf5da95e 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -394,7 +394,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] { diff --git a/src/core.rs b/src/core.rs index e76bcd8d..8845d2af 100644 --- a/src/core.rs +++ b/src/core.rs @@ -546,7 +546,6 @@ impl Core { } #[must_use] - #[cfg(feature = "winit")] pub fn blur( &self, theme: &Theme, diff --git a/src/surface/action.rs b/src/surface/action.rs index 6de5af71..0314d1d5 100644 --- a/src/surface/action.rs +++ b/src/surface/action.rs @@ -261,7 +261,7 @@ pub fn subsurface( ) } -#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))] +#[cfg(all(feature = "wayland", target_os = "linux"))] #[must_use] pub fn simple_layer_shell( live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static, @@ -297,7 +297,7 @@ pub fn simple_layer_shell( ) } -#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))] +#[cfg(all(feature = "wayland", target_os = "linux"))] #[must_use] pub fn app_layer_shell( live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static, diff --git a/src/surface/mod.rs b/src/surface/mod.rs index b3858b97..d34d684f 100644 --- a/src/surface/mod.rs +++ b/src/surface/mod.rs @@ -69,7 +69,6 @@ pub enum Action { Task(Arc Task + Send + Sync>), } -#[cfg(feature = "winit")] pub fn surface_task(action: Action) -> Task> { crate::task::message(crate::Action::Cosmic(crate::app::Action::Surface(action))) } diff --git a/src/widget/cards.rs b/src/widget/cards.rs index 006d6a31..e66a3c01 100644 --- a/src/widget/cards.rs +++ b/src/widget/cards.rs @@ -93,7 +93,7 @@ where /// Get an expandable stack of cards #[allow(clippy::too_many_arguments)] pub fn new( - _id: widget::Id, + id: widget::Id, card_inner_elements: Vec>, on_clear_all: Message, on_show_more: Option, diff --git a/src/widget/menu/menu_bar.rs b/src/widget/menu/menu_bar.rs index acb7ab06..7f72e9c4 100644 --- a/src/widget/menu/menu_bar.rs +++ b/src/widget/menu/menu_bar.rs @@ -716,7 +716,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) diff --git a/src/widget/nav_bar.rs b/src/widget/nav_bar.rs index d6595359..6f9d0210 100644 --- a/src/widget/nav_bar.rs +++ b/src/widget/nav_bar.rs @@ -137,7 +137,6 @@ impl<'a, Message: Clone + 'static> NavBar<'a, Message> { #[cfg(all( feature = "multi-window", feature = "wayland", - feature = "winit", target_os = "linux" ))] pub fn with_positioner( diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs index 11ee364d..fa4ce5b0 100644 --- a/src/widget/segmented_button/widget.rs +++ b/src/widget/segmented_button/widget.rs @@ -202,7 +202,6 @@ where #[cfg(all( feature = "multi-window", feature = "wayland", - feature = "winit", target_os = "linux" ))] positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner, @@ -267,7 +266,6 @@ where #[cfg(all( feature = "multi-window", feature = "wayland", - feature = "winit", target_os = "linux" ))] positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(), @@ -901,7 +899,6 @@ where #[cfg(all( feature = "multi-window", feature = "wayland", - feature = "winit", target_os = "linux" ))] pub fn with_positioner( @@ -939,7 +936,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] #[allow(clippy::too_many_lines)] @@ -1098,7 +1094,7 @@ where let rad = styling.menu_border_radius; /// Used to create a popup message from within a widget. - #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))] + #[cfg(all(feature = "wayland", target_os = "linux"))] #[must_use] pub fn simple_popup( live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static, @@ -1684,7 +1680,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] if is_pressed(event) @@ -1714,7 +1709,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] if let Some(on_activate) = self.on_activate.as_ref() { @@ -1780,7 +1774,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] if matches!( @@ -1924,7 +1917,6 @@ where #[cfg(all( feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] { @@ -2564,7 +2556,6 @@ where feature = "multi-window", feature = "wayland", target_os = "linux", - feature = "winit", feature = "surface-message" ))] if matches!(