skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve text demo: more fine control of letter spacing (#7520)

This commit is contained in:
Emil Ernerfeldt 2025-09-09 09:35:25 +02:00 committed by GitHub
parent 01ee23c1a0
commit c2912369ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/egui_demo_lib/src/demo/text_layout.rs
View File

@ -5,7 +5,7 @@ pub struct TextLayoutDemo {
break_anywhere: bool,
max_rows: usize,
overflow_character: Option<char>,
extra_letter_spacing_pixels: i32,
extra_letter_spacing: f32,
line_height_pixels: u32,
lorem_ipsum: bool,
}
@ -16,7 +16,7 @@ impl Default for TextLayoutDemo {
max_rows: 6,
break_anywhere: true,
overflow_character: Some('…'),
extra_letter_spacing_pixels: 0,
extra_letter_spacing: 0.0,
line_height_pixels: 0,
lorem_ipsum: true,
}
@ -45,7 +45,7 @@ impl crate::View for TextLayoutDemo {
break_anywhere,
max_rows,
overflow_character,
extra_letter_spacing_pixels,
extra_letter_spacing,
line_height_pixels,
lorem_ipsum,
} = self;
@ -85,7 +85,7 @@ impl crate::View for TextLayoutDemo {
ui.end_row();
ui.label("Extra letter spacing:");
ui.add(egui::DragValue::new(extra_letter_spacing_pixels).suffix(" pixels"));
ui.add(egui::DragValue::new(extra_letter_spacing).speed(0.1));
ui.end_row();
ui.label("Line height:");
@ -126,14 +126,13 @@ impl crate::View for TextLayoutDemo {
egui::ScrollArea::vertical()
.auto_shrink(false)
.show(ui, |ui| {
let extra_letter_spacing = points_per_pixel * *extra_letter_spacing_pixels as f32;
let line_height = (*line_height_pixels != 0)
.then_some(points_per_pixel * *line_height_pixels as f32);
let mut job = LayoutJob::single_section(
text.to_owned(),
egui::TextFormat {
extra_letter_spacing,
extra_letter_spacing: *extra_letter_spacing,
line_height,
..Default::default()
},

4
crates/egui_demo_lib/tests/snapshots/demos/Text Layout.png
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:beeb28e1e1d25281ad69736be3aae98ae6ca20c16873be5596f2e608894536b8
size 66019
oid sha256:ff51d191c5883bf68c0961aef70842543285e6513598dc57893edf5b4ccc5856
size 65490

2
crates/epaint/src/text/text_layout_types.rs
View File

@ -269,8 +269,6 @@ pub struct TextFormat {
/// Extra spacing between letters, in points.
///
/// Default: 0.0.
///
/// For even text it is recommended you round this to an even number of _pixels_.
pub extra_letter_spacing: f32,
/// Explicit line height of the text in points.