leyoda/cosmic-greeter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(greeter): use one vec for subscriptions

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-07-28 05:22:48 +02:00 • committed by Michael Murphy
parent 479fb1064e
commit 20b7a41247
1 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/greeter.rs
View file

@ -1270,24 +1270,7 @@ impl cosmic::Application for App {
fn subscription(&self) -> Subscription<Self::Message> { fn subscription(&self) -> Subscription<Self::Message> {
struct HeartbeatSubscription; struct HeartbeatSubscription;
//TODO: just use one vec for all subscriptions let mut subscriptions = vec![
let mut extra_suscriptions = Vec::with_capacity(2);
#[cfg(feature = "networkmanager")]
{
extra_suscriptions.push(
crate::networkmanager::subscription()
.map(|icon_opt| Message::NetworkIcon(icon_opt)),
);
}
#[cfg(feature = "upower")]
{
extra_suscriptions
.push(crate::upower::subscription().map(|info_opt| Message::PowerInfo(info_opt)));
}
Subscription::batch([
event::listen_with(|event, _| match event { event::listen_with(|event, _| match event {
iced::Event::PlatformSpecific(iced::event::PlatformSpecific::Wayland( iced::Event::PlatformSpecific(iced::event::PlatformSpecific::Wayland(
wayland_event, wayland_event,
@ -1315,7 +1298,22 @@ impl cosmic::Application for App {
}, },
), ),
ipc::subscription(), ipc::subscription(),
Subscription::batch(extra_suscriptions), ];
])
#[cfg(feature = "networkmanager")]
{
subscriptions.push(
crate::networkmanager::subscription()
.map(|icon_opt| Message::NetworkIcon(icon_opt)),
);
}
#[cfg(feature = "upower")]
{
subscriptions
.push(crate::upower::subscription().map(|info_opt| Message::PowerInfo(info_opt)));
}
Subscription::batch(subscriptions)
} }
} }