canary
/
canary-rs
2
1
Fork 0
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

Upgrade SAO theming #43

Merged
mars merged 17 commits from upgrade-sao-theming into main 2022-11-18 23:53:17 +00:00
Conversation 0 Commits 17 Files Changed 12 +9 -8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25532f4f9e - Show all commits

17
scripts/sao-ui/src/music_player.rs
View File

@ -179,7 +179,8 @@ impl MusicPlayerWidget {
text: content.to_string(), text: content.to_string(),
}; };
let label = Label::new_centered(text, 10.0, Color::BLACK); let color = style.body.text_color;
let label = Label::new_centered(text, 10.0, color);
Offset::new(label, Vec2::ZERO) Offset::new(label, Vec2::ZERO)
}; };
@ -196,7 +197,7 @@ impl MusicPlayerWidget {
text, text,
HorizontalAlignment::Center, HorizontalAlignment::Center,
scale, scale,
Color::BLACK, THEME.palette.text,
0.0, 0.0,
0.0, 0.0,
baseline, baseline,
@ -225,18 +226,18 @@ impl MusicPlayerWidget {
radius: style.footer.height * 0.3, radius: style.footer.height * 0.3,
spacing: style.footer.height * 0.1, spacing: style.footer.height * 0.1,
thickness: style.footer.height * 0.025, thickness: style.footer.height * 0.025,
body_color: Color(0xf1b841ff), body_color: THEME.palette.yellow,
ring_color: Color(0xf1b841ff), ring_color: THEME.palette.yellow,
icon_color: Color::BLACK, icon_color: THEME.palette.black,
}; };
let secondary_button = RoundButtonStyle { let secondary_button = RoundButtonStyle {
radius: style.footer.height * 0.25, radius: style.footer.height * 0.25,
spacing: style.footer.height * 0.05, spacing: style.footer.height * 0.05,
thickness: style.footer.height * 0.025, thickness: style.footer.height * 0.025,
body_color: Color::WHITE, body_color: style.footer.color,
ring_color: Color::BLACK, ring_color: THEME.palette.black,
icon_color: Color::BLACK, icon_color: THEME.palette.black,
}; };
let prev = RoundButton::new(secondary_button.clone(), Some(prev_text)); let prev = RoundButton::new(secondary_button.clone(), Some(prev_text));