titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup themeing

Browse Source
This commit is contained in:
Simon Gardling
2022-05-23 12:15:58 -04:00
parent c7a292341a
commit c65c1ea33f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/math_app.rs
View File

@@ -239,11 +239,11 @@ impl MathApp {
cc.egui_ctx.set_fonts(data.fonts); cc.egui_ctx.set_fonts(data.fonts);
// Set dark mode by default // Set dark mode by default
cc.egui_ctx.set_visuals(const { crate::style::dark() }); cc.egui_ctx.set_visuals(crate::style::STYLE);
// Set spacing // Set spacing
let mut style: egui::Style = (*cc.egui_ctx.style()).clone(); let mut style: egui::Style = (*cc.egui_ctx.style()).clone();
style.spacing = const { crate::style::spacing() }; style.spacing = crate::style::SPACING;
cc.egui_ctx.set_style(style); cc.egui_ctx.set_style(style);
tracing::info!("Initialized! Took: {:?}", start.elapsed()); tracing::info!("Initialized! Took: {:?}", start.elapsed());

5
src/style.rs
View File

@@ -46,8 +46,9 @@ const fn widgets_dark() -> Widgets {
} }
pub const STYLE: Visuals = dark(); pub const STYLE: Visuals = dark();
pub const SPACING: Spacing = spacing();
pub const fn dark() -> Visuals { const fn dark() -> Visuals {
Visuals { Visuals {
dark_mode: true, dark_mode: true,
override_text_color: None, override_text_color: None,
@@ -69,7 +70,7 @@ pub const fn dark() -> Visuals {
} }
} }
pub const fn spacing() -> Spacing { const fn spacing() -> Spacing {
Spacing { Spacing {
item_spacing: vec2(8.0, 3.0), item_spacing: vec2(8.0, 3.0),
window_margin: Margin::same(6.0), window_margin: Margin::same(6.0),