Make text wrap configurable

core/src/text.rs

@@ -40,6 +40,9 @@ pub struct Text<'a, Font> {
 
     /// The [`Shaping`] strategy of the [`Text`].
     pub shaping: Shaping,
+
+    /// The [`Wrap`] mode of the [`Text`].
+    pub wrap: Wrap,
 }
 
 /// The shaping strategy of some text.
@@ -66,6 +69,22 @@ pub enum Shaping {
     Advanced,
 }
 
+/// The wrap mode of some text.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+pub enum Wrap {
+    /// No wraping
+    None,
+    /// Wraps at a glyph level
+    Glyph,
+    /// Wraps at a word level
+    Word,
+    /// Wraps at the word level, or fallback to glyph level if a word can't fit on a line by itself
+    ///
+    /// This is the default
+    #[default]
+    WordOrGlyph,
+}
+
 /// The height of a line of text in a paragraph.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum LineHeight {

core/src/widget/text.rs

@@ -11,7 +11,7 @@ use crate::{
 
 use std::borrow::Cow;
 
-pub use text::{LineHeight, Shaping};
+pub use text::{LineHeight, Shaping, Wrap};
 
 /// A paragraph of text.
 #[allow(missing_debug_implementations)]
@@ -30,6 +30,7 @@ where
     vertical_alignment: alignment::Vertical,
     font: Option<Renderer::Font>,
     shaping: Shaping,
+    wrap: Wrap,
     style: Theme::Style,
 }
 
@@ -51,6 +52,7 @@ where
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
             shaping: Shaping::Advanced,
+            wrap: Default::default(),
             style: Default::default(),
         }
     }
@@ -116,6 +118,12 @@ where
         self.shaping = shaping;
         self
     }
+
+    /// Sets the [`Wrap`] mode of the [`Text`].
+    pub fn wrap(mut self, wrap: Wrap) -> Self {
+        self.wrap = wrap;
+        self
+    }
 }
 
 /// The internal state of a [`Text`] widget.
@@ -162,6 +170,7 @@ where
             self.horizontal_alignment,
             self.vertical_alignment,
             self.shaping,
+            self.wrap,
         )
     }
 
@@ -246,6 +255,7 @@ pub fn layout<Renderer>(
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
     shaping: Shaping,
+    wrap: Wrap,
 ) -> layout::Node
 where
     Renderer: text::Renderer,
@@ -267,6 +277,7 @@ where
             horizontal_alignment,
             vertical_alignment,
             shaping,
+            wrap,
         });
 
         paragraph.min_bounds()
@@ -347,6 +358,7 @@ where
             font: self.font,
             style: self.style.clone(),
             shaping: self.shaping,
+            wrap: self.wrap,
         }
     }
 }

graphics/src/text.rs

@@ -10,7 +10,7 @@ pub use paragraph::Paragraph;
 pub use cosmic_text;
 
 use crate::core::font::{self, Font};
-use crate::core::text::Shaping;
+use crate::core::text::{Shaping, Wrap};
 use crate::core::{Color, Point, Rectangle, Size};
 
 use once_cell::sync::OnceCell;
@@ -184,6 +184,16 @@ pub fn to_shaping(shaping: Shaping) -> cosmic_text::Shaping {
     }
 }
 
+/// Converts some [`Wrap`] mode to a [`cosmic_text::Wrap`] strategy.
+pub fn to_wrap(wrap: Wrap) -> cosmic_text::Wrap {
+    match wrap {
+        Wrap::None => cosmic_text::Wrap::None,
+        Wrap::Glyph => cosmic_text::Wrap::Glyph,
+        Wrap::Word => cosmic_text::Wrap::Word,
+        Wrap::WordOrGlyph => cosmic_text::Wrap::WordOrGlyph,
+    }
+}
+
 /// Converts some [`Color`] to a [`cosmic_text::Color`].
 pub fn to_color(color: Color) -> cosmic_text::Color {
     let [r, g, b, a] = color.into_rgba8();

graphics/src/text/paragraph.rs

@@ -1,7 +1,7 @@
 //! Draw paragraphs.
 use crate::core;
 use crate::core::alignment;
-use crate::core::text::{Hit, LineHeight, Shaping, Text};
+use crate::core::text::{Hit, LineHeight, Shaping, Text, Wrap};
 use crate::core::{Font, Pixels, Point, Size};
 use crate::text;
 
@@ -17,6 +17,7 @@ struct Internal {
     content: String, // TODO: Reuse from `buffer` (?)
     font: Font,
     shaping: Shaping,
+    wrap: Wrap,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
     bounds: Size,
@@ -81,6 +82,8 @@ impl core::text::Paragraph for Paragraph {
             Some(text.bounds.height),
         );
 
+        buffer.set_wrap(font_system.raw(), text::to_wrap(text.wrap));
+
         buffer.set_text(
             font_system.raw(),
             text.content,
@@ -97,6 +100,7 @@ impl core::text::Paragraph for Paragraph {
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
             shaping: text.shaping,
+            wrap: text.wrap,
             bounds: text.bounds,
             min_bounds,
             version: font_system.version(),
@@ -141,6 +145,7 @@ impl core::text::Paragraph for Paragraph {
                     horizontal_alignment: internal.horizontal_alignment,
                     vertical_alignment: internal.vertical_alignment,
                     shaping: internal.shaping,
+                    wrap: internal.wrap,
                 });
             }
         }
@@ -274,6 +279,7 @@ impl Default for Internal {
             content: String::new(),
             font: Font::default(),
             shaping: Shaping::default(),
+            wrap: Wrap::default(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
             bounds: Size::ZERO,

widget/src/checkbox.rs

@@ -63,6 +63,7 @@ pub struct Checkbox<
     text_size: Option<Pixels>,
     text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
+    text_wrap: text::Wrap,
     font: Option<Renderer::Font>,
     icon: Icon<Renderer::Font>,
     style: <Theme as StyleSheet>::Style,
@@ -101,13 +102,15 @@ where
             text_size: None,
             text_line_height: text::LineHeight::default(),
             text_shaping: text::Shaping::Advanced,
+            text_wrap: text::Wrap::default(),
             font: None,
             icon: Icon {
                 font: Renderer::ICON_FONT,
                 code_point: Renderer::CHECKMARK_ICON,
                 size: None,
                 line_height: text::LineHeight::default(),
                 shaping: text::Shaping::Advanced,
+                wrap: text::Wrap::default(),
             },
             style: Default::default(),
         }
@@ -177,6 +180,12 @@ where
         self
     }
 
+    /// Sets the [`text::Wrap`] mode of the [`Checkbox`].
+    pub fn text_wrap(mut self, wrap: text::Wrap) -> Self {
+        self.text_wrap = wrap;
+        self
+    }
+
     /// Sets the [`Renderer::Font`] of the text of the [`Checkbox`].
     ///
     /// [`Renderer::Font`]: crate::core::text::Renderer
@@ -277,6 +286,7 @@ where
                     alignment::Horizontal::Left,
                     alignment::Vertical::Top,
                     self.text_shaping,
+                    self.text_wrap,
                 )
             },
         )
@@ -368,6 +378,7 @@ where
                 size,
                 line_height,
                 shaping,
+                wrap,
             } = &self.icon;
             let size = size.unwrap_or(Pixels(bounds.height * 0.7));
 
@@ -382,6 +393,7 @@ where
                         horizontal_alignment: alignment::Horizontal::Center,
                         vertical_alignment: alignment::Vertical::Center,
                         shaping: *shaping,
+                        wrap: *wrap,
                     },
                     bounds.center(),
                     custom_style.icon_color,
@@ -520,4 +532,6 @@ pub struct Icon<Font> {
     pub line_height: text::LineHeight,
     /// The shaping strategy of the icon.
     pub shaping: text::Shaping,
+    /// The wrap mode of the icon.
+    pub wrap: text::Wrap,
 }

widget/src/overlay/menu.rs

@@ -39,6 +39,7 @@ pub struct Menu<
     text_size: Option<Pixels>,
     text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
+    text_wrap: text::Wrap,
     font: Option<Renderer::Font>,
     style: Theme::Style,
 }
@@ -70,6 +71,7 @@ where
             text_size: None,
             text_line_height: text::LineHeight::default(),
             text_shaping: text::Shaping::Advanced,
+            text_wrap: text::Wrap::default(),
             font: None,
             style: Default::default(),
         }
@@ -108,6 +110,12 @@ where
         self
     }
 
+    /// Sets the [`text::Wrap`] mode of the [`Menu`].
+    pub fn text_wrap(mut self, wrap: text::Wrap) -> Self {
+        self.text_wrap = wrap;
+        self
+    }
+
     /// Sets the font of the [`Menu`].
     pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
         self.font = Some(font.into());
@@ -202,6 +210,7 @@ where
             text_size,
             text_line_height,
             text_shaping,
+            text_wrap,
             style,
         } = menu;
 
@@ -214,6 +223,7 @@ where
             text_size,
             text_line_height,
             text_shaping,
+            text_wrap,
             padding,
             style: style.clone(),
         }));
@@ -332,6 +342,7 @@ where
     text_size: Option<Pixels>,
     text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
+    text_wrap: text::Wrap,
     font: Option<Renderer::Font>,
     style: Theme::Style,
 }
@@ -534,6 +545,7 @@ where
                     horizontal_alignment: alignment::Horizontal::Left,
                     vertical_alignment: alignment::Vertical::Center,
                     shaping: self.text_shaping,
+                    wrap: self.text_wrap,
                 },
                 Point::new(bounds.x + self.padding.left, bounds.center_y()),
                 if is_selected {