djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Text wrap correctly on Chinese chraracter (#104)

Browse source 
* Text wrap correctly on Chinese chrarcter

* Text wrap correctly on Chinese chraracter, checked by a stand-alone function
This commit is contained in:
n2 2021-01-12 17:15:51 +08:00 committed by GitHub
parent b6ba98a40f
commit 449192e5fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
epaint/src/text/font.rs
View file

@ -142,6 +142,13 @@ impl FontImpl {
type FontIndex = usize; type FontIndex = usize;
#[inline]
fn is_chinese(c: char) -> bool {
(c >= '\u{4E00}' && c <= '\u{9FFF}')
|| (c >= '\u{3400}' && c <= '\u{4DBF}')
|| (c >= '\u{2B740}' && c <= '\u{2B81F}')
}
// TODO: rename? // TODO: rename?
/// Wrapper over multiple `FontImpl` (e.g. a primary + fallbacks for emojis) /// Wrapper over multiple `FontImpl` (e.g. a primary + fallbacks for emojis)
#[derive(Default)] #[derive(Default)]
@ -392,8 +399,8 @@ impl Font {
let mut cursor_y = 0.0; let mut cursor_y = 0.0;
let mut row_start_idx = 0; let mut row_start_idx = 0;
// start index of the last space. A candidate for a new row. // start index of the last space or hieroglyphs. A candidate for a new row.
let mut last_space = None; let mut newline_mark = None;
let mut out_rows = vec![]; let mut out_rows = vec![];
@ -402,7 +409,7 @@ impl Font {
let potential_row_width = first_row_indentation + x - row_start_x; let potential_row_width = first_row_indentation + x - row_start_x;
if potential_row_width > max_width_in_points { if potential_row_width > max_width_in_points {
if let Some(last_space_idx) = last_space { if let Some(last_space_idx) = newline_mark {
// We include the trailing space in the row: // We include the trailing space in the row:
let row = Row { let row = Row {
x_offsets: full_x_offsets[row_start_idx..=last_space_idx + 1] x_offsets: full_x_offsets[row_start_idx..=last_space_idx + 1]
@ -418,7 +425,7 @@ impl Font {
row_start_idx = last_space_idx + 1; row_start_idx = last_space_idx + 1;
row_start_x = first_row_indentation + full_x_offsets[row_start_idx]; row_start_x = first_row_indentation + full_x_offsets[row_start_idx];
last_space = None; newline_mark = None;
cursor_y = self.round_to_pixel(cursor_y + self.row_height()); cursor_y = self.round_to_pixel(cursor_y + self.row_height());
} else if out_rows.is_empty() && first_row_indentation > 0.0 { } else if out_rows.is_empty() && first_row_indentation > 0.0 {
assert_eq!(row_start_idx, 0); assert_eq!(row_start_idx, 0);
@ -437,8 +444,8 @@ impl Font {
} }
const NON_BREAKING_SPACE: char = '\u{A0}'; const NON_BREAKING_SPACE: char = '\u{A0}';
if chr.is_whitespace() && chr != NON_BREAKING_SPACE { if (chr.is_whitespace() && chr != NON_BREAKING_SPACE) || is_chinese(chr) {
last_space = Some(i); newline_mark = Some(i);
} }
} }