-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #623 from woelper/system_fonts
System fonts
- Loading branch information
Showing
8 changed files
with
541 additions
and
367 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| use super::*; | ||
| use crate::appstate::OculanteState; | ||
| use std::{collections::HashMap, fs::read}; | ||
| use egui::{Context, FontData, FontDefinitions}; | ||
| use epaint::FontFamily; | ||
| use font_kit::{ | ||
| family_name::FamilyName, handle::Handle, properties::Properties, source::SystemSource | ||
| }; | ||
|
|
||
| pub fn apply_theme(state: &mut OculanteState, ctx: &Context) { | ||
| let mut button_color = Color32::from_hex("#262626").unwrap_or_default(); | ||
| let mut panel_color = Color32::from_gray(25); | ||
|
|
||
| match state.persistent_settings.theme { | ||
| ColorTheme::Light => ctx.set_visuals(Visuals::light()), | ||
| ColorTheme::Dark => ctx.set_visuals(Visuals::dark()), | ||
| ColorTheme::System => set_system_theme(ctx), | ||
| } | ||
|
|
||
| // Switching theme resets accent color, set it again | ||
| let mut style: egui::Style = (*ctx.style()).clone(); | ||
| style.spacing.scroll = egui::style::ScrollStyle::solid(); | ||
|
|
||
| if style.visuals.dark_mode { | ||
| // Text color for label | ||
| style.visuals.widgets.noninteractive.fg_stroke.color = | ||
| Color32::from_hex("#CCCCCC").unwrap_or_default(); | ||
| // Text color for buttons | ||
| style.visuals.widgets.inactive.fg_stroke.color = | ||
| Color32::from_hex("#CCCCCC").unwrap_or_default(); | ||
| style.visuals.extreme_bg_color = Color32::from_hex("#0D0D0D").unwrap_or_default(); | ||
| if state.persistent_settings.background_color == [200, 200, 200] { | ||
| state.persistent_settings.background_color = | ||
| PersistentSettings::default().background_color; | ||
| } | ||
| if state.persistent_settings.accent_color == [0, 170, 255] { | ||
| state.persistent_settings.accent_color = PersistentSettings::default().accent_color; | ||
| } | ||
| } else { | ||
| style.visuals.extreme_bg_color = Color32::from_hex("#D9D9D9").unwrap_or_default(); | ||
| // Text color for label | ||
| style.visuals.widgets.noninteractive.fg_stroke.color = | ||
| Color32::from_hex("#333333").unwrap_or_default(); | ||
| // Text color for buttons | ||
| style.visuals.widgets.inactive.fg_stroke.color = | ||
| Color32::from_hex("#333333").unwrap_or_default(); | ||
|
|
||
| button_color = Color32::from_gray(255); | ||
| panel_color = Color32::from_gray(230); | ||
| if state.persistent_settings.background_color | ||
| == PersistentSettings::default().background_color | ||
| { | ||
| state.persistent_settings.background_color = [200, 200, 200]; | ||
| } | ||
| if state.persistent_settings.accent_color == PersistentSettings::default().accent_color { | ||
| state.persistent_settings.accent_color = [0, 170, 255]; | ||
| } | ||
| style.visuals.widgets.inactive.bg_fill = Color32::WHITE; | ||
| style.visuals.widgets.hovered.bg_fill = Color32::WHITE.gamma_multiply(0.8); | ||
| } | ||
| style.interaction.tooltip_delay = 0.0; | ||
| style.spacing.icon_width = 20.; | ||
| style.spacing.window_margin = 5.0.into(); | ||
| style.spacing.item_spacing = vec2(8., 6.); | ||
| style.spacing.icon_width_inner = style.spacing.icon_width / 1.5; | ||
| style.spacing.interact_size.y = BUTTON_HEIGHT_SMALL; | ||
| style.visuals.window_fill = panel_color; | ||
|
|
||
| // button color | ||
| style.visuals.widgets.inactive.weak_bg_fill = button_color; | ||
| // style.visuals.widgets.inactive.bg_fill = button_color; | ||
| // style.visuals.widgets.inactive.bg_fill = button_color; | ||
|
|
||
| // button rounding | ||
| style.visuals.widgets.inactive.rounding = Rounding::same(4.); | ||
| style.visuals.widgets.active.rounding = Rounding::same(4.); | ||
| style.visuals.widgets.hovered.rounding = Rounding::same(4.); | ||
|
|
||
| // No stroke on buttons | ||
| style.visuals.widgets.hovered.bg_stroke = Stroke::NONE; | ||
|
|
||
| style.visuals.warn_fg_color = Color32::from_rgb(255, 204, 0); | ||
|
|
||
| style.visuals.panel_fill = panel_color; | ||
|
|
||
| style.text_styles.get_mut(&TextStyle::Body).unwrap().size = 15.; | ||
| style.text_styles.get_mut(&TextStyle::Button).unwrap().size = 15.; | ||
| style.text_styles.get_mut(&TextStyle::Small).unwrap().size = 12.; | ||
| style.text_styles.get_mut(&TextStyle::Heading).unwrap().size = 18.; | ||
| // accent color | ||
| style.visuals.selection.bg_fill = Color32::from_rgb( | ||
| state.persistent_settings.accent_color[0], | ||
| state.persistent_settings.accent_color[1], | ||
| state.persistent_settings.accent_color[2], | ||
| ); | ||
|
|
||
| let accent_color = style.visuals.selection.bg_fill.to_array(); | ||
|
|
||
| let accent_color_luma = (accent_color[0] as f32 * 0.299 | ||
| + accent_color[1] as f32 * 0.587 | ||
| + accent_color[2] as f32 * 0.114) | ||
| .clamp(0., 255.) as u8; | ||
| let accent_color_luma = if accent_color_luma < 80 { 220 } else { 80 }; | ||
| // Set text on highlighted elements | ||
| style.visuals.selection.stroke = Stroke::new(2.0, Color32::from_gray(accent_color_luma)); | ||
| ctx.set_style(style); | ||
| } | ||
|
|
||
|
|
||
| /// Attempt to load a system font by any of the given `family_names`, returning the first match. | ||
| fn load_font_family(family_names: &[&str]) -> Option<Vec<u8>> { | ||
| let system_source = SystemSource::new(); | ||
|
|
||
| for &name in family_names { | ||
| let font_handle = system_source | ||
| .select_best_match(&[FamilyName::Title(name.to_string())], &Properties::new()); | ||
| match font_handle { | ||
| Ok(h) => { | ||
| match &h { | ||
| Handle::Memory { bytes, .. } => { | ||
| debug!("Loaded {name} from memory."); | ||
| return Some(bytes.to_vec()); | ||
| } | ||
| Handle::Path { path, .. } => { | ||
| info!("Loaded {name} from path: {:?}", path); | ||
| if let Ok(data) = read(path) { | ||
| return Some(data); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Err(e) => error!("Could not load {}: {:?}", name, e), | ||
| } | ||
| } | ||
|
|
||
| None | ||
| } | ||
|
|
||
| pub fn load_system_fonts(mut fonts: FontDefinitions) -> FontDefinitions{ | ||
| debug!("Attempting to load sys fonts"); | ||
| let mut fontdb = HashMap::new(); | ||
|
|
||
| fontdb.insert("chinese_simplified", vec![ | ||
| "Heiti SC", | ||
| "Songti SC", | ||
| "Noto Sans CJK SC", // Good coverage for Simplified Chinese | ||
| "Noto Sans SC", | ||
| "Noto Sans CJK JP", | ||
| "Noto Sans JP", | ||
| "WenQuanYi Zen Hei", | ||
| "SimSun", | ||
| "MS Gothic", | ||
| "Noto Sans SC", | ||
| "PingFang SC", | ||
| ]); | ||
|
|
||
| fontdb.insert("arabic", vec![ | ||
| "Noto Sans Arabic", | ||
| "Amiri", | ||
| "Lateef", | ||
| "Al Tarikh", | ||
| "Segoe UI", | ||
| ]); | ||
|
|
||
| for (region, font_names) in fontdb { | ||
| if let Some(font_data) = load_font_family(&font_names) { | ||
| info!("Inserting font {region}"); | ||
| fonts | ||
| .font_data | ||
| .insert(region.to_owned(), FontData::from_owned(font_data)); | ||
|
|
||
| fonts.families | ||
| .get_mut(&FontFamily::Proportional) | ||
| .unwrap() | ||
| .push(region.to_owned()); | ||
| } | ||
| } | ||
| fonts | ||
| } |