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

fix: remove get_corner_radii method and replace it with cosmic::theme::system_preference

Browse source
This commit is contained in:
Eduardo Flores 2024-05-01 14:36:43 -07:00 • committed by Ashley Wulber
parent 68395be330
commit 013197b9ce
1 changed files with 4 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

47
cosmic-settings/src/pages/desktop/panel/inner.rs
View file

@ -503,7 +503,10 @@ impl PageInner {
} }
if panel_config.anchor_gap || !panel_config.expand_to_edges { if panel_config.anchor_gap || !panel_config.expand_to_edges {
let radii = Self::get_corner_radii().radius_xl[0] as u32; let radii = cosmic::theme::system_preference()
.cosmic()
.corner_radii
.radius_xl[0] as u32;
panel_config.border_radius = radii; panel_config.border_radius = radii;
} else { } else {
panel_config.border_radius = 0; panel_config.border_radius = 0;
@ -511,46 +514,4 @@ impl PageInner {
_ = panel_config.write_entry(helper); _ = panel_config.write_entry(helper);
} }
fn get_corner_radii() -> CornerRadii {
let theme_mode_config = ThemeMode::config().ok();
let theme_mode = theme_mode_config
.as_ref()
.map(|c| match ThemeMode::get_entry(c) {
Ok(t) => t,
Err((errors, t)) => {
for e in errors {
tracing::error!("{e}");
}
t
}
})
.unwrap_or_default();
let theme_builder_config = if theme_mode.is_dark {
ThemeBuilder::dark_config()
} else {
ThemeBuilder::light_config()
}
.ok();
let theme_builder = theme_builder_config.as_ref().map_or_else(
|| {
if theme_mode.is_dark {
ThemeBuilder::dark()
} else {
ThemeBuilder::light()
}
},
|c| match ThemeBuilder::get_entry(c) {
Ok(t) => t,
Err((errors, t)) => {
for e in errors {
tracing::error!("{e}");
}
t
}
},
);
theme_builder.corner_radii
}
} }