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:
commit
c60495c66c
32 changed files with 773 additions and 419 deletions
|
|
@ -35,7 +35,7 @@ pub enum Message {
|
|||
PopupClosed(Id),
|
||||
ToggleExampleRow(bool),
|
||||
Selected(usize),
|
||||
Surface(cosmic::surface::Action),
|
||||
Surface(cosmic::surface::Action<Message>),
|
||||
Toggle(bool),
|
||||
}
|
||||
|
||||
|
|
@ -76,9 +76,7 @@ impl cosmic::Application for Window {
|
|||
self.example_row = toggled;
|
||||
}
|
||||
Message::Surface(a) => {
|
||||
return cosmic::task::message(cosmic::Action::Cosmic(
|
||||
cosmic::app::Action::Surface(a),
|
||||
));
|
||||
return cosmic::task::message(cosmic::Action::Surface(a));
|
||||
}
|
||||
Message::Selected(i) => {
|
||||
self.selected = Some(i);
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
pub enum Message {
|
||||
Clicked,
|
||||
WindowClose,
|
||||
Surface(cosmic::surface::Action),
|
||||
Surface(cosmic::surface::Action<Message>),
|
||||
ToggleHideContent,
|
||||
ToggleSomeAction,
|
||||
WindowNew,
|
||||
|
|
@ -89,9 +89,7 @@ impl cosmic::Application for App {
|
|||
self.button_label = format!("Clicked {message:?}");
|
||||
}
|
||||
Message::Surface(action) => {
|
||||
return cosmic::task::message(cosmic::Action::Cosmic(
|
||||
cosmic::app::Action::Surface(action),
|
||||
));
|
||||
return cosmic::task::message(cosmic::Action::Surface(action));
|
||||
}
|
||||
Message::WindowClose
|
||||
| Message::ToggleHideContent
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ pub enum Message {
|
|||
OpenError(Arc<file_chooser::Error>),
|
||||
OpenFile,
|
||||
Selected(Url),
|
||||
Surface(cosmic::surface::Action),
|
||||
Surface(cosmic::surface::Action<Message>),
|
||||
}
|
||||
|
||||
/// The [`App`] stores application-specific state.
|
||||
|
|
@ -187,9 +187,7 @@ impl cosmic::Application for App {
|
|||
self.error_status = None;
|
||||
}
|
||||
Message::Surface(action) => {
|
||||
return cosmic::task::message(cosmic::Action::Cosmic(
|
||||
cosmic::app::Action::Surface(action),
|
||||
));
|
||||
return cosmic::task::message(cosmic::Action::Surface(action));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue