diff --git a/OFL.txt b/OFL.txt index daa25d00412..f2c97bb62c2 100755 --- a/OFL.txt +++ b/OFL.txt @@ -1,4 +1,5 @@ -Copyright 2011 The Comfortaa Project Authors (https://github.com/alexeiva/comfortaa), with Reserved Font Name "Comfortaa". +Copyright (c) 2009-2012, Vernon Adams (vern@newtypography.co.uk) +https://github.com/KDE/oxygen-fonts This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: diff --git a/README.md b/README.md index 417311b9e10..0a2c8222dd6 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,4 @@ Egui is under MIT OR Apache-2.0 license. Fonts: -* Comfortaa: Open Font License, see OFT.txt -* ProggyClean.ttf, Copyright (c) 2004, 2005 Tristan Grimmer. MIT License. -* Roboto-Regular.ttf: Apache License, Version 2.0 +* Oxygen: Open Font License, see OFL.txt diff --git a/egui/fonts/Comfortaa-Regular.ttf b/egui/fonts/Comfortaa-Regular.ttf deleted file mode 100755 index a2d19d59d8e..00000000000 Binary files a/egui/fonts/Comfortaa-Regular.ttf and /dev/null differ diff --git a/egui/fonts/DejaVuSans.ttf b/egui/fonts/DejaVuSans.ttf deleted file mode 100644 index e5f7eecce43..00000000000 Binary files a/egui/fonts/DejaVuSans.ttf and /dev/null differ diff --git a/egui/fonts/DejaVuSansMono.ttf b/egui/fonts/DejaVuSansMono.ttf deleted file mode 100644 index f5786022f18..00000000000 Binary files a/egui/fonts/DejaVuSansMono.ttf and /dev/null differ diff --git a/egui/fonts/Oxygen-Regular.ttf b/egui/fonts/Oxygen-Regular.ttf new file mode 100644 index 00000000000..416f8e640b7 Binary files /dev/null and b/egui/fonts/Oxygen-Regular.ttf differ diff --git a/egui/fonts/OxygenMono-Regular.ttf b/egui/fonts/OxygenMono-Regular.ttf new file mode 100644 index 00000000000..d160502b5f1 Binary files /dev/null and b/egui/fonts/OxygenMono-Regular.ttf differ diff --git a/egui/fonts/ProggyClean.ttf b/egui/fonts/ProggyClean.ttf deleted file mode 100644 index 0270cdfe3ca..00000000000 Binary files a/egui/fonts/ProggyClean.ttf and /dev/null differ diff --git a/egui/fonts/Roboto-Regular.ttf b/egui/fonts/Roboto-Regular.ttf deleted file mode 100644 index 2c97eeadffe..00000000000 Binary files a/egui/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/egui/src/paint/fonts.rs b/egui/src/paint/fonts.rs index e03109e9f62..05c5f1f948b 100644 --- a/egui/src/paint/fonts.rs +++ b/egui/src/paint/fonts.rs @@ -46,10 +46,10 @@ impl Default for FontDefinitions { impl FontDefinitions { pub fn with_pixels_per_point(pixels_per_point: f32) -> Self { let mut fonts = BTreeMap::new(); - fonts.insert(TextStyle::Body, (FontFamily::VariableWidth, 14.0)); + fonts.insert(TextStyle::Body, (FontFamily::VariableWidth, 15.0)); fonts.insert(TextStyle::Button, (FontFamily::VariableWidth, 16.0)); fonts.insert(TextStyle::Heading, (FontFamily::VariableWidth, 24.0)); - fonts.insert(TextStyle::Monospace, (FontFamily::Monospace, 13.0)); + fonts.insert(TextStyle::Monospace, (FontFamily::Monospace, 14.0)); Self { pixels_per_point, @@ -97,13 +97,8 @@ impl Fonts { let atlas = Arc::new(Mutex::new(atlas)); // TODO: figure out a way to make the WASM smaller despite including a font. Zip it? - let monospace_typeface_data = include_bytes!("../../fonts/ProggyClean.ttf"); // Use 13 for this. NOTHING ELSE. - - // let monospace_typeface_data = include_bytes!("../../fonts/Roboto-Regular.ttf"); - - let variable_typeface_data = include_bytes!("../../fonts/Comfortaa-Regular.ttf"); // Funny, hard to read - - // let variable_typeface_data = include_bytes!("../../fonts/DejaVuSans.ttf"); // Basic, boring, takes up more space + let monospace_typeface_data = include_bytes!("../../fonts/OxygenMono-Regular.ttf"); + let variable_typeface_data = include_bytes!("../../fonts/Oxygen-Regular.ttf"); self.definitions = definitions.clone(); let FontDefinitions {