@@ -10,7 +10,7 @@ pub struct MiscDemoWindow {
10
10
11
11
break_anywhere : bool ,
12
12
max_rows : usize ,
13
- overflow_character : char ,
13
+ overflow_character : Option < char > ,
14
14
15
15
widgets : Widgets ,
16
16
colors : ColorWidgets ,
@@ -25,7 +25,7 @@ impl Default for MiscDemoWindow {
25
25
26
26
max_rows : 2 ,
27
27
break_anywhere : false ,
28
- overflow_character : '…' ,
28
+ overflow_character : Some ( '…' ) ,
29
29
30
30
widgets : Default :: default ( ) ,
31
31
colors : Default :: default ( ) ,
@@ -419,7 +419,7 @@ fn text_layout_ui(
419
419
ui : & mut egui:: Ui ,
420
420
max_rows : & mut usize ,
421
421
break_anywhere : & mut bool ,
422
- overflow_character : & mut char ,
422
+ overflow_character : & mut Option < char > ,
423
423
) {
424
424
use egui:: text:: LayoutJob ;
425
425
@@ -583,17 +583,18 @@ fn text_layout_ui(
583
583
} ) ;
584
584
ui. checkbox ( break_anywhere, "Break anywhere" ) ;
585
585
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 ( '-' ) , " - " ) ;
589
590
ui. label ( "Overflow character" ) ;
590
591
} ) ;
591
592
592
593
let mut job = LayoutJob :: single_section ( LOREM_IPSUM . to_string ( ) , TextFormat :: default ( ) ) ;
593
594
job. wrap = TextWrapping {
594
595
max_rows : * max_rows,
595
596
break_anywhere : * break_anywhere,
596
- overflow_character : Some ( * overflow_character) ,
597
+ overflow_character : * overflow_character,
597
598
..Default :: default ( )
598
599
} ;
599
600
ui. label ( job) ;
0 commit comments