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

chore(date): match selected timezone styling to designs

Browse source
This commit is contained in:
Vukašin Vojinović 2025-10-01 20:31:46 +02:00 • committed by Michael Murphy
parent 2d6d507a48
commit a865d6b101
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cosmic-settings/src/pages/time/date.rs
View file

@ -22,6 +22,7 @@ use icu::{
}; };
use slab::Slab; use slab::Slab;
use slotmap::{Key, SlotMap}; use slotmap::{Key, SlotMap};
use std::rc::Rc;
pub use timedate_zbus::TimeDateProxy; pub use timedate_zbus::TimeDateProxy;
use tracing::error; use tracing::error;
@ -345,12 +346,36 @@ impl Page {
} }
fn timezone_context_item<'a>(&self, id: usize, timezone: &'a str) -> Element<'a, Message> { fn timezone_context_item<'a>(&self, id: usize, timezone: &'a str) -> Element<'a, Message> {
widget::button::custom(widget::settings::item_row(vec![ let svg_accent = Rc::new(|theme: &cosmic::Theme| cosmic::widget::svg::Style {
widget::text::body(timezone).wrapping(Wrapping::Word).into(), color: Some(theme.cosmic().accent_text_color().into()),
widget::horizontal_space().into(), });
])) let selected = Some(id) == self.timezone;
widget::settings::item_row(vec![
widget::text::body(timezone)
.class(if selected {
cosmic::theme::Text::Accent
} else {
cosmic::theme::Text::Default
})
.wrapping(Wrapping::Word)
.width(cosmic::iced::Length::Fill)
.into(),
if selected {
widget::icon::from_name("object-select-symbolic")
.size(16)
.icon()
.class(cosmic::theme::Svg::Custom(svg_accent.clone()))
.into()
} else {
widget::horizontal_space().width(16).into()
},
])
.apply(widget::container)
.class(cosmic::theme::Container::List)
.apply(widget::button::custom)
.class(cosmic::theme::Button::Transparent)
.on_press(Message::Timezone(id)) .on_press(Message::Timezone(id))
.class(cosmic::theme::Button::Icon)
.into() .into()
} }

5
cosmic-settings/src/pages/time/region.rs
View file

@ -346,9 +346,8 @@ impl Page {
let search_input = &self.add_language_search.trim().to_lowercase(); let search_input = &self.add_language_search.trim().to_lowercase();
let svg_accent = Rc::new(|theme: &cosmic::Theme| { let svg_accent = Rc::new(|theme: &cosmic::Theme| cosmic::widget::svg::Style {
let color = theme.cosmic().accent_text_color().into(); color: Some(theme.cosmic().accent_text_color().into()),
cosmic::widget::svg::Style { color: Some(color) }
}); });
for (id, available_language) in &self.available_languages { for (id, available_language) in &self.available_languages {