Skip to content

Commit 250d043

Browse files
committed
Add an option to set overflow character to None in text wrapping demo
1 parent 473d18e commit 250d043

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

egui_demo_lib/src/apps/demo/misc_demo_window.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub struct MiscDemoWindow {
1010

1111
break_anywhere: bool,
1212
max_rows: usize,
13-
overflow_character: char,
13+
overflow_character: Option<char>,
1414

1515
widgets: Widgets,
1616
colors: ColorWidgets,
@@ -25,7 +25,7 @@ impl Default for MiscDemoWindow {
2525

2626
max_rows: 2,
2727
break_anywhere: false,
28-
overflow_character: '…',
28+
overflow_character: Some('…'),
2929

3030
widgets: Default::default(),
3131
colors: Default::default(),
@@ -419,7 +419,7 @@ fn text_layout_ui(
419419
ui: &mut egui::Ui,
420420
max_rows: &mut usize,
421421
break_anywhere: &mut bool,
422-
overflow_character: &mut char,
422+
overflow_character: &mut Option<char>,
423423
) {
424424
use egui::text::LayoutJob;
425425

@@ -583,17 +583,18 @@ fn text_layout_ui(
583583
});
584584
ui.checkbox(break_anywhere, "Break anywhere");
585585
ui.horizontal(|ui| {
586-
ui.selectable_value(overflow_character, '…', "…");
587-
ui.selectable_value(overflow_character, '—', "—");
588-
ui.selectable_value(overflow_character, '-', " - ");
586+
ui.selectable_value(overflow_character, None, "None");
587+
ui.selectable_value(overflow_character, Some('…'), "…");
588+
ui.selectable_value(overflow_character, Some('—'), "—");
589+
ui.selectable_value(overflow_character, Some('-'), " - ");
589590
ui.label("Overflow character");
590591
});
591592

592593
let mut job = LayoutJob::single_section(LOREM_IPSUM.to_string(), TextFormat::default());
593594
job.wrap = TextWrapping {
594595
max_rows: *max_rows,
595596
break_anywhere: *break_anywhere,
596-
overflow_character: Some(*overflow_character),
597+
overflow_character: *overflow_character,
597598
..Default::default()
598599
};
599600
ui.label(job);

0 commit comments

Comments
 (0)