merge: upstream/master vers epoch-1.8.0

# Conflicts:
#	iced
#	src/surface/action.rs
#	src/surface/mod.rs
#	src/widget/text_input/input.rs
#	src/widget/toaster/widget.rs
This commit is contained in:
Lionel DARNIS 2026-09-10 17:55:59 +02:00
commit c60495c66c
32 changed files with 773 additions and 419 deletions

View file

@ -98,7 +98,7 @@ pub enum Message {
Input2(String),
Ignore,
ToggleHide,
Surface(cosmic::surface::Action),
Surface(cosmic::surface::Action<Message>),
Hi,
Hi2,
Hi3,
@ -255,9 +255,7 @@ impl cosmic::Application for App {
self.hidden = !self.hidden;
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
Message::Hi => {
dbg!("hi");