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

chore: cargo fmt

Browse source
This commit is contained in:
Vukašin Vojinović 2025-06-08 16:24:38 +02:00 • committed by Ashley Wulber
parent 8b2bf931ae
commit cdf431c510
1 changed files with 56 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

94
cosmic-settings/src/pages/accessibility/mod.rs
View file

@ -13,7 +13,9 @@ use cosmic_settings_page::{
self as page, Insert, self as page, Insert,
section::{self, Section}, section::{self, Section},
}; };
use cosmic_settings_subscriptions::accessibility::{DBusRequest, DBusUpdate, subscription as a11y_subscription}; use cosmic_settings_subscriptions::accessibility::{
DBusRequest, DBusUpdate, subscription as a11y_subscription,
};
use cosmic_settings_subscriptions::cosmic_a11y_manager; use cosmic_settings_subscriptions::cosmic_a11y_manager;
use num_traits::FromPrimitive; use num_traits::FromPrimitive;
use slotmap::SlotMap; use slotmap::SlotMap;
@ -163,10 +165,11 @@ impl page::Page<crate::pages::Message> for Page {
cosmic::Task::none() cosmic::Task::none()
} }
fn subscription(&self, _core: &cosmic::Core) -> cosmic::iced::Subscription<crate::pages::Message> { fn subscription(
a11y_subscription().map(|m| { &self,
super::Message::Accessibility(Message::DBusUpdate(m)) _core: &cosmic::Core,
}) ) -> cosmic::iced::Subscription<crate::pages::Message> {
a11y_subscription().map(|m| super::Message::Accessibility(Message::DBusUpdate(m)))
} }
} }
@ -198,10 +201,14 @@ pub fn vision() -> section::Section<crate::pages::Message> {
settings::section() settings::section()
.title(&section.title) .title(&section.title)
.add(settings::item::builder(&descriptions[screen_reader]) .add(
.toggler(page.reader_enabled, |enabled| { settings::item::builder(&descriptions[screen_reader]).toggler(
crate::pages::Message::from(Message::ScreenReaderEnabled(enabled)) page.reader_enabled,
})) |enabled| {
crate::pages::Message::from(Message::ScreenReaderEnabled(enabled))
},
),
)
.add({ .add({
let (magnifier_entity, _magnifier_info) = binder let (magnifier_entity, _magnifier_info) = binder
.info .info
@ -227,22 +234,30 @@ pub fn vision() -> section::Section<crate::pages::Message> {
.then_some(crate::pages::Message::Page(magnifier_entity).into()), .then_some(crate::pages::Message::Page(magnifier_entity).into()),
) )
}) })
.add(settings::item::builder(&descriptions[high_contrast]) .add(
.toggler(page.theme.is_high_contrast, |enable| Message::HighContrast(enable).into())) settings::item::builder(&descriptions[high_contrast])
.add(settings::item::builder(&descriptions[invert_colors]).control( .toggler(page.theme.is_high_contrast, |enable| {
toggler(page.screen_inverted).on_toggle_maybe( Message::HighContrast(enable).into()
page.wayland_available }),
.is_some_and(|ver| ver >= 2) )
.then_some(|set| Message::SetScreenInverted(set).into()), .add(
), settings::item::builder(&descriptions[invert_colors]).control(
)) toggler(page.screen_inverted).on_toggle_maybe(
.add(settings::item::builder(&descriptions[color_filters]).control( page.wayland_available
toggler(page.screen_filter_active).on_toggle_maybe( .is_some_and(|ver| ver >= 2)
page.wayland_available .then_some(|set| Message::SetScreenInverted(set).into()),
.is_some_and(|ver| ver >= 2) ),
.then_some(|set| Message::SetScreenFilterActive(set).into()), ),
), )
)) .add(
settings::item::builder(&descriptions[color_filters]).control(
toggler(page.screen_filter_active).on_toggle_maybe(
page.wayland_available
.is_some_and(|ver| ver >= 2)
.then_some(|set| Message::SetScreenFilterActive(set).into()),
),
),
)
.add({ .add({
let selections = if page.screen_filter_selection == ColorFilter::Unknown { let selections = if page.screen_filter_selection == ColorFilter::Unknown {
&page.screen_filter_selections &page.screen_filter_selections
@ -250,20 +265,23 @@ pub fn vision() -> section::Section<crate::pages::Message> {
&page.screen_filter_selections[0..4] &page.screen_filter_selections[0..4]
}; };
let dropdown = dropdown::popup_dropdown::<_, crate::pages::Message, crate::pages::Message>( let dropdown = dropdown::popup_dropdown::<
selections, _,
Some(page.screen_filter_selection as usize), crate::pages::Message,
move |idx| { crate::pages::Message,
let filter = ColorFilter::from_usize(idx).unwrap_or_default(); >(
Message::SetScreenFilterSelection(filter).into() selections,
}, Some(page.screen_filter_selection as usize),
cosmic::iced::window::Id::RESERVED, move |idx| {
|action| Message::Surface(action).into(), let filter = ColorFilter::from_usize(idx).unwrap_or_default();
|a| a Message::SetScreenFilterSelection(filter).into()
); },
cosmic::iced::window::Id::RESERVED,
|action| Message::Surface(action).into(),
|a| a,
);
settings::item::builder(&descriptions[color_filter_type]) settings::item::builder(&descriptions[color_filter_type]).control(dropdown)
.control(dropdown)
}) })
.into() .into()
}) })