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

Adjust text color

Browse source
This commit is contained in:
Jeremy Soller 2025-01-31 16:09:17 -07:00
parent d65acd4979
commit fe143a689f
No known key found for this signature in database
GPG key ID: 670FDFB5428E05CA
1 changed files with 43 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/main.rs
View file

@ -1276,53 +1276,53 @@ impl Application for App {
.into(); .into();
let mut background_color = Color::BLACK; let mut background_color = Color::BLACK;
if let Some(album_art) = &self.album_art_opt { let mut text_color_opt = None;
if !video.has_video() { if !video.has_video() {
background_color = theme.cosmic().bg_component_color().into(); background_color = theme.cosmic().bg_component_color().into();
text_color_opt = Some(Color::from(theme.cosmic().on_bg_component_color()));
let mut col = widget::column(); let mut col = widget::column();
col = col.push(widget::vertical_space(Length::Fill)); col = col.push(widget::vertical_space(Length::Fill));
if let Some(album_art) = &self.album_art_opt {
col = col.push( col = col.push(
widget::image(widget::image::Handle::from_path(album_art.path())) widget::image(widget::image::Handle::from_path(album_art.path()))
.content_fit(ContentFit::ScaleDown) .content_fit(ContentFit::ScaleDown)
.width(Length::Fill), .width(Length::Fill),
); );
col = col.push(widget::vertical_space(space_s)); }
//TODO: fallback if title missing col = col.push(widget::vertical_space(space_s));
col = col.push(widget::text::title4(&self.mpris_meta.title)); //TODO: fallback if title missing
for artist in self.mpris_meta.artists.iter() { col = col.push(widget::text::title4(&self.mpris_meta.title));
col = col.push(widget::text::body(artist)); for artist in self.mpris_meta.artists.iter() {
} col = col.push(widget::text::body(artist));
col = col.push(widget::vertical_space(space_s)); }
if !self.mpris_meta.album.is_empty() { col = col.push(widget::vertical_space(space_s));
col = col.push(widget::text::body(fl!( if !self.mpris_meta.album.is_empty() {
"album", col = col.push(widget::text::body(fl!(
album = self.mpris_meta.album.as_str() "album",
))); album = self.mpris_meta.album.as_str()
} )));
if let Some(year) = &self.mpris_meta.album_year_opt { }
col = col.push(widget::text::body(format!("{}", year))); if let Some(year) = &self.mpris_meta.album_year_opt {
} col = col.push(widget::text::body(format!("{}", year)));
col = col.push(widget::vertical_space(Length::Fill)); }
col = col.push(widget::vertical_space(Length::Fill));
// Space to keep from going under control overlay // Space to keep from going under control overlay
let mut control_height = space_xxs + 32 + space_xxs; let mut control_height = space_xxs + 32 + space_xxs;
if self.core.is_condensed() { if self.core.is_condensed() {
control_height += space_xxs + 32; control_height += space_xxs + 32;
} }
// This is a hack to have the video player running but not visible (since the controls will cover it as an overlay) // This is a hack to have the video player running but not visible (since the controls will cover it as an overlay)
video_player = widget::row::with_children(vec![ video_player = widget::row::with_children(vec![
widget::horizontal_space(Length::Fill).into(), widget::horizontal_space(Length::Fill).into(),
widget::container( widget::container(col.push(widget::container(video_player).height(control_height)))
col.push(widget::container(video_player).height(control_height)),
)
.width(320) .width(320)
.into(), .into(),
widget::horizontal_space(Length::Fill).into(), widget::horizontal_space(Length::Fill).into(),
]) ])
.into(); .into();
}
} }
let mouse_area = widget::mouse_area(video_player) let mouse_area = widget::mouse_area(video_player)
@ -1522,7 +1522,12 @@ impl Application for App {
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fill) .height(Length::Fill)
.style(theme::Container::Custom(Box::new(move |_theme| { .style(theme::Container::Custom(Box::new(move |_theme| {
widget::container::Appearance::default().with_background(background_color) let mut appearance =
widget::container::Appearance::default().with_background(background_color);
if let Some(text_color) = text_color_opt {
appearance.text_color = Some(text_color);
}
appearance
}))) })))
.into() .into()
} }