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

refactor: allow opting out of automatic keyboard navigation

Browse source
This commit is contained in:
Ashley Wulber 2024-03-01 13:53:15 -05:00 • committed by Ashley Wulber
parent 268b47d000
commit 3e68e39366
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/app/cosmic.rs
View file

@ -177,11 +177,8 @@ where
None
});
Subscription::batch(vec![
let mut subscriptions = vec![
self.app.subscription().map(super::Message::App),
keyboard_nav::subscription()
.map(Message::KeyboardNav)
.map(super::Message::Cosmic),
self.app
.core()
.watch_config::<cosmic_theme::Theme>(if self.app.core().system_theme_mode.is_dark {
@ -213,7 +210,17 @@ where
.single_instance
.then(|| super::single_instance_subscription::<T>())
.unwrap_or_else(Subscription::none),
])
];
if self.app.core().keyboard_nav {
subscriptions.push(
keyboard_nav::subscription()
.map(Message::KeyboardNav)
.map(super::Message::Cosmic),
);
}
Subscription::batch(subscriptions)
}
#[cfg(not(any(feature = "multi-window", feature = "wayland")))]