daniel543x/gridcraft
1
0 Fork 0
mirror of https://github.com/storytold/gridcraft.git synced 2026-11-15 14:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Share Linux Noto directory list across Thai and Hebrew font lookups

Browse Source 
Removes the duplicated directory arrays flagged by SonarCloud new-code duplication.
This commit is contained in:
Dylan M. Taylor committed 2026-10-24 22:42:28 -04:00
1 parent 9f22a06627
commit 5b2921e616
1 file changed
+14 -14
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/theme.rs
+14 -14
View File
@@ -645,19 +645,25 @@ fn cjk_hangul() -> Vec<(String, u32)> {
}
/// Thai faces. Windows ships Leelawadee UI and Tahoma/Microsoft Sans Serif (both carry Thai);
/// Linux font directories searched by the Thai and Hebrew faces, in priority order.
#[cfg(not(target_arch = "wasm32"))]
fn linux_noto_dirs() -> [&'static str; 5] {
[
"/usr/share/fonts/truetype/noto",
"/usr/share/fonts/opentype/noto",
"/usr/share/fonts/truetype",
"/usr/share/fonts",
"/usr/share/fonts/chromeos/noto", // ChromeOS's Linux container (#1762)
]
}
/// macOS has Thonburi; Linux usually has Noto Sans Thai or Garuda.
#[cfg(not(target_arch = "wasm32"))]
fn thai() -> Vec<(String, u32)> {
let mac_sys = "/System/Library/Fonts";
let mac_sup = "/System/Library/Fonts/Supplemental";
let win = windows_fonts();
let lin = [
"/usr/share/fonts/truetype/noto",
"/usr/share/fonts/opentype/noto",
"/usr/share/fonts/truetype",
"/usr/share/fonts",
"/usr/share/fonts/chromeos/noto", // ChromeOS's Linux container (#1762)
];
let lin = linux_noto_dirs();
let mut v: Vec<(String, u32)> = vec![
(format!("{win}\\LeelawUI.ttf"), 0), // Leelawadee UI
(format!("{win}\\tahoma.ttf"), 0), // Tahoma
@@ -703,13 +709,7 @@ fn hebrew() -> Vec<(String, u32)> {
let mac_sys = "/System/Library/Fonts";
let mac_sup = "/System/Library/Fonts/Supplemental";
let win = windows_fonts();
let lin = [
"/usr/share/fonts/truetype/noto",
"/usr/share/fonts/opentype/noto",
"/usr/share/fonts/truetype",
"/usr/share/fonts",
"/usr/share/fonts/chromeos/noto", // ChromeOS's Linux container (#1762)
];
let lin = linux_noto_dirs();
let mut v: Vec<(String, u32)> = vec![
(format!("{win}\\david.ttf"), 0), // David
(format!("{win}\\frank.ttf"), 0), // FrankRuehl