leyoda/libcosmic-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

yoda: absorb upstream theme-v2 integration debt post-rebase

Browse source 
- 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
This commit is contained in:
Lionel DARNIS 2026-07-02 19:00:00 +02:00
parent 18c2326f34
commit 9e9ae942c4
9 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/app/cosmic.rs
View file

@ -23,7 +23,6 @@ use iced::Application as IcedApplication;
use iced::event::wayland; use iced::event::wayland;
use iced::{Task, theme, window}; use iced::{Task, theme, window};
use iced_futures::event::listen_with; use iced_futures::event::listen_with;
#[cfg(feature = "winit")]
use iced_winit::SurfaceIdWrapper; use iced_winit::SurfaceIdWrapper;
use palette::color_difference::EuclideanDistance; use palette::color_difference::EuclideanDistance;
@ -1568,7 +1567,7 @@ impl<App: Application> Cosmic<App> {
if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) { if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) {
window::enable_blur(id) window::enable_blur(id)
} else { } else {
#[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
{ {
iced_winit::commands::blur::blur( iced_winit::commands::blur::blur(
id, id,
@ -1579,7 +1578,7 @@ impl<App: Application> Cosmic<App> {
) )
.discard() .discard()
} }
#[cfg(not(all(feature = "wayland", feature = "winit", target_os = "linux")))] #[cfg(not(all(feature = "wayland", target_os = "linux")))]
{ {
iced::window::enable_blur(id) iced::window::enable_blur(id)
} }
@ -1587,11 +1586,11 @@ impl<App: Application> Cosmic<App> {
} else if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) { } else if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) {
window::disable_blur(id) window::disable_blur(id)
} else { } 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() 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) iced::window::disable_blur(id)
} }
@ -1601,7 +1600,7 @@ impl<App: Application> Cosmic<App> {
cmds.push(if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) { cmds.push(if matches!(id_wrapper, SurfaceIdWrapper::Window(_)) {
window::enable_blur(id) window::enable_blur(id)
} else { } else {
#[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
{ {
iced_winit::commands::blur::blur( iced_winit::commands::blur::blur(
id, id,
@ -1612,13 +1611,13 @@ impl<App: Application> Cosmic<App> {
) )
.discard() .discard()
} }
#[cfg(not(all(feature = "wayland", feature = "winit", target_os = "linux")))] #[cfg(not(all(feature = "wayland", target_os = "linux")))]
{ {
iced::window::enable_blur(id) 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 { if let Some(corners) = live_settings.corners {
cmds.push( cmds.push(
iced_winit::commands::corner_radius::corner_radius(id, Some(corners)).discard(), iced_winit::commands::corner_radius::corner_radius(id, Some(corners)).discard(),
@ -1634,7 +1633,7 @@ impl<App: Application> Cosmic<App> {
); );
} }
} }
#[cfg(all(feature = "wayland", feature = "winit", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
if let (SurfaceIdWrapper::LayerSurface(id), Some(padding)) = if let (SurfaceIdWrapper::LayerSurface(id), Some(padding)) =
(id_wrapper, live_settings.padding) (id_wrapper, live_settings.padding)
{ {

1
src/app/mod.rs
View file

@ -394,7 +394,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
{ {

1
src/core.rs
View file

@ -546,7 +546,6 @@ impl Core {
} }
#[must_use] #[must_use]
#[cfg(feature = "winit")]
pub fn blur( pub fn blur(
&self, &self,
theme: &Theme, theme: &Theme,

4
src/surface/action.rs
View file

@ -261,7 +261,7 @@ pub fn subsurface<App: Application>(
) )
} }
#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
#[must_use] #[must_use]
pub fn simple_layer_shell<Message: 'static>( pub fn simple_layer_shell<Message: 'static>(
live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static, live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
@ -297,7 +297,7 @@ pub fn simple_layer_shell<Message: 'static>(
) )
} }
#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
#[must_use] #[must_use]
pub fn app_layer_shell<App: Application>( pub fn app_layer_shell<App: Application>(
live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static, live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static,

1
src/surface/mod.rs
View file

@ -69,7 +69,6 @@ pub enum Action {
Task(Arc<dyn Fn() -> Task<Action> + Send + Sync>), Task(Arc<dyn Fn() -> Task<Action> + Send + Sync>),
} }
#[cfg(feature = "winit")]
pub fn surface_task<M: Send + 'static>(action: Action) -> Task<crate::Action<M>> { pub fn surface_task<M: Send + 'static>(action: Action) -> Task<crate::Action<M>> {
crate::task::message(crate::Action::Cosmic(crate::app::Action::Surface(action))) crate::task::message(crate::Action::Cosmic(crate::app::Action::Surface(action)))
} }

2
src/widget/cards.rs
View file

@ -93,7 +93,7 @@ where
/// Get an expandable stack of cards /// Get an expandable stack of cards
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub fn new<F, G>( pub fn new<F, G>(
_id: widget::Id, id: widget::Id,
card_inner_elements: Vec<Element<'a, Message, crate::Theme, crate::Renderer>>, card_inner_elements: Vec<Element<'a, Message, crate::Theme, crate::Renderer>>,
on_clear_all: Message, on_clear_all: Message,
on_show_more: Option<F>, on_show_more: Option<F>,

1
src/widget/menu/menu_bar.rs
View file

@ -716,7 +716,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))

1
src/widget/nav_bar.rs
View file

@ -137,7 +137,6 @@ impl<'a, Message: Clone + 'static> NavBar<'a, Message> {
#[cfg(all( #[cfg(all(
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
feature = "winit",
target_os = "linux" target_os = "linux"
))] ))]
pub fn with_positioner( pub fn with_positioner(

11
src/widget/segmented_button/widget.rs
View file

@ -202,7 +202,6 @@ where
#[cfg(all( #[cfg(all(
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
feature = "winit",
target_os = "linux" target_os = "linux"
))] ))]
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner, positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
@ -267,7 +266,6 @@ where
#[cfg(all( #[cfg(all(
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
feature = "winit",
target_os = "linux" target_os = "linux"
))] ))]
positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(), positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(),
@ -901,7 +899,6 @@ where
#[cfg(all( #[cfg(all(
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
feature = "winit",
target_os = "linux" target_os = "linux"
))] ))]
pub fn with_positioner( pub fn with_positioner(
@ -939,7 +936,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
@ -1098,7 +1094,7 @@ where
let rad = styling.menu_border_radius; let rad = styling.menu_border_radius;
/// Used to create a popup message from within a widget. /// 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] #[must_use]
pub fn simple_popup<Message: 'static>( pub fn simple_popup<Message: 'static>(
live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static, live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
@ -1684,7 +1680,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
if is_pressed(event) if is_pressed(event)
@ -1714,7 +1709,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
if let Some(on_activate) = self.on_activate.as_ref() { if let Some(on_activate) = self.on_activate.as_ref() {
@ -1780,7 +1774,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
if matches!( if matches!(
@ -1924,7 +1917,6 @@ where
#[cfg(all( #[cfg(all(
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
{ {
@ -2564,7 +2556,6 @@ where
feature = "multi-window", feature = "multi-window",
feature = "wayland", feature = "wayland",
target_os = "linux", target_os = "linux",
feature = "winit",
feature = "surface-message" feature = "surface-message"
))] ))]
if matches!( if matches!(