leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: make the single-instance feature additive

Browse source
This commit is contained in:
Ashley Wulber 2023-11-21 15:18:39 -05:00 • committed by Michael Murphy
parent 001fd744c5
commit 57f4abb8a0
5 changed files with 53 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/app/cosmic.rs
View file

@ -97,6 +97,8 @@ where
super::Message::App(message) => self.app.update(message),
super::Message::Cosmic(message) => self.cosmic_update(message),
super::Message::None => iced::Command::none(),
#[cfg(feature = "single-instance")]
super::Message::DbusActivation(message) => self.app.dbus_activation(message),
}
}
@ -184,7 +186,7 @@ where
.core()
.single_instance
.then(|| super::single_instance_subscription::<T>())
.unwrap_or_else(Subscription::none),
.unwrap_or_else(|| Subscription::none()),
])
}
@ -364,11 +366,12 @@ impl<T: Application> Cosmic<T> {
});
}
}
Message::Activate(token) => {
Message::Activate(_token) => {
#[cfg(feature = "wayland")]
return iced_sctk::commands::activation::activate(
iced::window::Id::default(),
token,
#[allow(clippy::used_underscore_binding)]
_token,
);
}
}