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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue