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

Use THEME in dialog style defaults

This commit is contained in:
mars 2022-11-18 13:08:28 -07:00
parent 948dfa77c4
commit 1ac70e653b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/sao-ui/src/widgets/dialog.rs
View File

@ -40,7 +40,7 @@ pub struct DialogStyle {
impl Default for DialogStyle {
fn default() -> Self {
Self {
rounding: 5.0,
rounding: THEME.metrics.surface_rounding,
header: Default::default(),
body: Default::default(),
footer: Default::default(),
@ -61,10 +61,10 @@ pub struct DialogHeaderStyle {
impl Default for DialogHeaderStyle {
fn default() -> Self {
Self {
color: Color::WHITE,
color: THEME.palette.surface,
height: 20.0,
text_font: Font::new(crate::DISPLAY_FONT),
text_color: Color::BLACK,
text_color: THEME.palette.text,
text_scale_factor: 0.65,
text_baseline: 0.25,
}
@ -82,9 +82,9 @@ pub struct DialogBodyStyle {
impl Default for DialogBodyStyle {
fn default() -> Self {
Self {
color: Color::WHITE.with_alpha(0xb0),
color: THEME.palette.base,
text_font: Font::new(crate::CONTENT_FONT),
text_color: Color::BLACK,
text_color: THEME.palette.text,
text_size: 5.0,
}
}
@ -103,7 +103,7 @@ impl Default for DialogFooterStyle {
Self {
icon_font: Font::new(crate::ICON_FONT),
button_radius: 7.5,
color: Color::WHITE,
color: THEME.palette.surface,
height: 15.0,
}
}