merge: upstream/libcosmic a l'etat pinne par epoch-1.9.0 (08a09e3df)
# Conflicts: # Cargo.toml # i18n/th/libcosmic.ftl # iced # src/surface/action.rs # src/surface/mod.rs
This commit is contained in:
commit
97f42e565a
51 changed files with 1212 additions and 611 deletions
|
|
@ -394,7 +394,7 @@ where
|
|||
{
|
||||
nav = nav
|
||||
.window_id_maybe(self.core().main_window_id())
|
||||
.on_surface_action(|m| crate::Action::Cosmic(crate::app::Action::Surface(m)))
|
||||
.on_surface_action(|action| crate::Action::Surface(action.flatten()))
|
||||
}
|
||||
let mut nav = nav
|
||||
.into_container()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue