merge: epoch-1.9.0 d'upstream
# Conflicts: # Cargo.lock # Cargo.toml # cosmic-app-list/Cargo.toml # cosmic-app-list/cosmic-app-list-config/Cargo.toml # cosmic-applet-a11y/Cargo.toml # cosmic-applet-audio/Cargo.toml # cosmic-applet-battery/Cargo.toml # cosmic-applet-bluetooth/Cargo.toml # cosmic-applet-input-sources/Cargo.toml # cosmic-applet-minimize/Cargo.toml # cosmic-applet-network/Cargo.toml # cosmic-applet-notifications/Cargo.toml # cosmic-applet-power/Cargo.toml # cosmic-applet-status-area/Cargo.toml # cosmic-applet-tiling/Cargo.toml # cosmic-applet-time/Cargo.toml # cosmic-applet-workspaces/Cargo.toml # cosmic-applets-config/Cargo.toml # cosmic-applets/Cargo.toml # cosmic-applets/src/main.rs # cosmic-panel-button/Cargo.toml
This commit is contained in:
commit
e13e162e53
64 changed files with 1223 additions and 789 deletions
|
|
@ -39,7 +39,7 @@ struct Button {
|
|||
enum Msg {
|
||||
Press,
|
||||
ConfigUpdated(CosmicPanelButtonConfig),
|
||||
Surface(surface::Action),
|
||||
Surface(surface::Action<Msg>),
|
||||
}
|
||||
|
||||
impl Button {
|
||||
|
|
@ -141,9 +141,7 @@ impl cosmic::Application for Button {
|
|||
.unwrap_or_default();
|
||||
}
|
||||
Msg::Surface(a) => {
|
||||
return cosmic::task::message(cosmic::Action::Cosmic(
|
||||
cosmic::app::Action::Surface(a),
|
||||
));
|
||||
return cosmic::task::message(cosmic::Action::Surface(a));
|
||||
}
|
||||
}
|
||||
Task::none()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue