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

fix(audio): rtl media title overlap on controls

Browse source
This commit is contained in:
Ashley Wulber 2024-08-09 20:40:49 -04:00 • committed by Michael Murphy
parent 8f3131615a
commit af658aa14d
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cosmic-applet-audio/src/lib.rs
View file

@ -817,14 +817,22 @@ impl cosmic::Application for Audio {
fl!("unknown-artist") fl!("unknown-artist")
}; };
elements.push(column![text(title).size(14), text(artists).size(10),].into()); elements.push(
elements.push(horizontal_space(Length::Fill).into()); column![
text(title).size(14).width(Length::Shrink),
text(artists).size(10).width(Length::Shrink),
]
.width(Length::FillPortion(5))
.into(),
);
let mut control_elements = Vec::with_capacity(4);
control_elements.push(horizontal_space(Length::Fill).into());
if let Some(go_prev) = self.go_previous(32) { if let Some(go_prev) = self.go_previous(32) {
elements.push(go_prev); control_elements.push(go_prev);
} }
if let Some(play) = self.is_play() { if let Some(play) = self.is_play() {
elements.push( control_elements.push(
button::icon( button::icon(
icon::from_name(if play { PLAY } else { PAUSE }) icon::from_name(if play { PLAY } else { PAUSE })
.size(32) .size(32)
@ -841,8 +849,16 @@ impl cosmic::Application for Audio {
); );
} }
if let Some(go_next) = self.go_next(32) { if let Some(go_next) = self.go_next(32) {
elements.push(go_next); control_elements.push(go_next);
} }
let control_cnt = control_elements.len() as u16;
elements.push(
Row::with_children(control_elements)
.align_items(Alignment::Center)
.width(Length::FillPortion(control_cnt.saturating_add(1)))
.spacing(8)
.into(),
);
audio_content = audio_content.push(padded_control(divider::horizontal::default())); audio_content = audio_content.push(padded_control(divider::horizontal::default()));
audio_content = audio_content.push( audio_content = audio_content.push(

2
rust-toolchain.toml
View file

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.75" channel = "1.80.0"