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::{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<App: Application> Cosmic<App> {
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<App: Application> Cosmic<App> {
)
.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<App: Application> Cosmic<App> {
} 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<App: Application> Cosmic<App> {
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<App: Application> Cosmic<App> {
)
.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<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)) =
(id_wrapper, live_settings.padding)
{

1
src/app/mod.rs
View file

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