migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Change the default FontTweak

Browse Source
This commit is contained in:
Emil Ernerfeldt
2024-09-17 10:45:10 +02:00
parent 51333c265b
commit 6346f3f836
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/epaint/src/text/fonts.rs
View File

@@ -189,7 +189,7 @@ impl Default for FontTweak {
scale: 1.0, scale: 1.0,
y_offset_factor: 0.0, y_offset_factor: 0.0,
y_offset: 0.0, y_offset: 0.0,
baseline_offset_factor: -0.0333, // makes the default fonts look more centered in buttons and such baseline_offset_factor: 0.0,
} }
} }
} }
@@ -270,30 +270,30 @@ impl Default for FontDefinitions {
let mut families = BTreeMap::new(); let mut families = BTreeMap::new();
// We tweak the fonts slightly to improve their vertical alignment in buttons etc:
font_data.insert("Hack".to_owned(), FontData::from_static(HACK_REGULAR)); font_data.insert("Hack".to_owned(), FontData::from_static(HACK_REGULAR));
font_data.insert(
"Ubuntu-Light".to_owned(),
FontData::from_static(UBUNTU_LIGHT),
);
// Some good looking emojis. Use as first priority: // Some good looking emojis. Use as first priority:
font_data.insert( font_data.insert(
"NotoEmoji-Regular".to_owned(), "NotoEmoji-Regular".to_owned(),
FontData::from_static(NOTO_EMOJI_REGULAR).tweak(FontTweak { FontData::from_static(NOTO_EMOJI_REGULAR).tweak(FontTweak {
scale: 0.81, // make it smaller scale: 0.81, // Make smaller
y_offset_factor: -0.120, // Move up
..Default::default() ..Default::default()
}), }),
); );
font_data.insert(
"Ubuntu-Light".to_owned(),
FontData::from_static(UBUNTU_LIGHT),
);
// Bigger emojis, and more. <http://jslegers.github.io/emoji-icon-font/>: // Bigger emojis, and more. <http://jslegers.github.io/emoji-icon-font/>:
font_data.insert( font_data.insert(
"emoji-icon-font".to_owned(), "emoji-icon-font".to_owned(),
FontData::from_static(EMOJI_ICON).tweak(FontTweak { FontData::from_static(EMOJI_ICON).tweak(FontTweak {
scale: 0.88, // make it smaller scale: 0.90, // Make smaller
y_offset_factor: 0.09, // Move down
// probably not correct, but this does make texts look better (#2724 for details)
y_offset_factor: 0.11, // move glyphs down to better align with common fonts
baseline_offset_factor: -0.11, // ...now the entire row is a bit down so shift it back
..Default::default() ..Default::default()
}), }),
); );