Add wrapping strategy for text and text_editor widgets

core/src/renderer/null.rs

@@ -2,7 +2,7 @@ use crate::alignment;
 use crate::image::{self, Image};
 use crate::renderer::{self, Renderer};
 use crate::svg;
-use crate::text::{self, Text};
+use crate::text::{self, Text, Wrapping};
 use crate::{
     Background, Color, Font, Pixels, Point, Rectangle, Size, Transformation,
 };
@@ -159,6 +159,7 @@ impl text::Editor for () {
         &mut self,
         _new_bounds: Size,
         _new_font: Self::Font,
+        _new_wrapping: Wrapping,
         _new_size: Pixels,
         _new_line_height: text::LineHeight,
         _new_highlighter: &mut impl text::Highlighter,

core/src/text.rs

@@ -41,6 +41,25 @@ pub struct Text<Content = String, Font = crate::Font> {
 
     /// The [`Shaping`] strategy of the [`Text`].
     pub shaping: Shaping,
+
+    /// The [`Wrapping`] strategy of the [`Text`].
+    pub wrapping: Wrapping,
+}
+
+/// The wrapping strategy of some text.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+pub enum Wrapping {
+    /// No wrapping.
+    None,
+    /// Word wrapping.
+    ///
+    /// This is the default.
+    #[default]
+    Word,
+    /// Glyph wrapping.
+    Glyph,
+    /// Word or glyph wrapping.
+    WordOrGlyph,
 }
 
 /// The shaping strategy of some text.

core/src/text/editor.rs

@@ -1,6 +1,6 @@
 //! Edit text.
 use crate::text::highlighter::{self, Highlighter};
-use crate::text::LineHeight;
+use crate::text::{LineHeight, Wrapping};
 use crate::{Pixels, Point, Rectangle, Size};
 
 use std::sync::Arc;
@@ -48,6 +48,7 @@ pub trait Editor: Sized + Default {
         &mut self,
         new_bounds: Size,
         new_font: Self::Font,
+        new_wrapping: Wrapping,
         new_size: Pixels,
         new_line_height: LineHeight,
         new_highlighter: &mut impl Highlighter,

core/src/text/paragraph.rs

@@ -95,6 +95,7 @@ impl<P: Paragraph> Plain<P> {
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
             shaping: text.shaping,
+            wrapping: text.wrapping,
         }) {
             Difference::None => {}
             Difference::Bounds => {

core/src/widget/text.rs

@@ -11,7 +11,7 @@ use crate::{
     Widget,
 };
 
-pub use text::{LineHeight, Shaping};
+pub use text::{LineHeight, Shaping, Wrapping};
 
 /// A paragraph of text.
 #[allow(missing_debug_implementations)]
@@ -30,6 +30,7 @@ where
     font: Option<Renderer::Font>,
     shaping: Shaping,
     class: Theme::Class<'a>,
+    wrapping: Wrapping,
 }
 
 impl<'a, Theme, Renderer> Text<'a, Theme, Renderer>
@@ -50,6 +51,7 @@ where
             vertical_alignment: alignment::Vertical::Top,
             shaping: Shaping::Basic,
             class: Theme::default(),
+            wrapping: Default::default(),
         }
     }
 
@@ -115,6 +117,12 @@ where
         self
     }
 
+    /// Sets the [`Wrapping`] strategy of the [`Text`].
+    pub fn wrapping(mut self, wrapping: Wrapping) -> Self {
+        self.wrapping = wrapping;
+        self
+    }
+
     /// Sets the style of the [`Text`].
     #[must_use]
     pub fn style(mut self, style: impl Fn(&Theme) -> Style + 'a) -> Self
@@ -198,6 +206,7 @@ where
             self.horizontal_alignment,
             self.vertical_alignment,
             self.shaping,
+            self.wrapping,
         )
     }
 
@@ -232,6 +241,7 @@ pub fn layout<Renderer>(
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
     shaping: Shaping,
+    wrapping: Wrapping,
 ) -> layout::Node
 where
     Renderer: text::Renderer,
@@ -253,6 +263,7 @@ where
             horizontal_alignment,
             vertical_alignment,
             shaping,
+            wrapping,
         });
 
         paragraph.min_bounds()

examples/editor/src/main.rs

@@ -2,10 +2,12 @@ use iced::highlighter;
 use iced::keyboard;
 use iced::widget::{
     button, column, container, horizontal_space, pick_list, row, text,
-    text_editor, tooltip,
+    text_editor, toggler, tooltip,
 };
+use iced::Length;
 use iced::{Center, Element, Fill, Font, Subscription, Task, Theme};
 
+use iced::widget::text::Wrapping;
 use std::ffi;
 use std::io;
 use std::path::{Path, PathBuf};
@@ -26,6 +28,7 @@ struct Editor {
     theme: highlighter::Theme,
     is_loading: bool,
     is_dirty: bool,
+    wrap: bool,
 }
 
 #[derive(Debug, Clone)]
@@ -37,6 +40,7 @@ enum Message {
     FileOpened(Result<(PathBuf, Arc<String>), Error>),
     SaveFile,
     FileSaved(Result<PathBuf, Error>),
+    ToggleWrap(bool),
 }
 
 impl Editor {
@@ -48,6 +52,7 @@ impl Editor {
                 theme: highlighter::Theme::SolarizedDark,
                 is_loading: true,
                 is_dirty: false,
+                wrap: true,
             },
             Task::perform(
                 load_file(format!(
@@ -123,6 +128,10 @@ impl Editor {
 
                 Task::none()
             }
+            Message::ToggleWrap(enabled) => {
+                self.wrap = enabled;
+                Task::none()
+            }
         }
     }
 
@@ -149,13 +158,16 @@ impl Editor {
                 self.is_dirty.then_some(Message::SaveFile)
             ),
             horizontal_space(),
+            toggler("Word wrap".to_string(), self.wrap, Message::ToggleWrap)
+                .text_size(14)
+                .width(Length::Shrink),
             pick_list(
                 highlighter::Theme::ALL,
                 Some(self.theme),
                 Message::ThemeSelected
             )
             .text_size(14)
-            .padding([5, 10])
+            .padding([5, 10]),
         ]
         .spacing(10)
         .align_y(Center);
@@ -185,6 +197,11 @@ impl Editor {
             controls,
             text_editor(&self.content)
                 .height(Fill)
+                .wrapping(if self.wrap {
+                    Wrapping::WordOrGlyph
+                } else {
+                    Wrapping::None
+                })
                 .on_action(Message::ActionPerformed)
                 .highlight(
                     self.file

graphics/src/text.rs

@@ -14,6 +14,7 @@ use crate::core::font::{self, Font};
 use crate::core::text::Shaping;
 use crate::core::{Color, Pixels, Point, Rectangle, Size, Transformation};
 
+use iced_core::text::Wrapping;
 use once_cell::sync::OnceCell;
 use std::borrow::Cow;
 use std::sync::{Arc, RwLock, Weak};
@@ -251,6 +252,15 @@ pub fn to_attributes(font: Font) -> cosmic_text::Attrs<'static> {
         .style(to_style(font.style))
 }
 
+fn to_wrap(wrapping: Wrapping) -> cosmic_text::Wrap {
+    match wrapping {
+        Wrapping::None => cosmic_text::Wrap::None,
+        Wrapping::Word => cosmic_text::Wrap::Word,
+        Wrapping::Glyph => cosmic_text::Wrap::Glyph,
+        Wrapping::WordOrGlyph => cosmic_text::Wrap::WordOrGlyph,
+    }
+}
+
 fn to_family(family: font::Family) -> cosmic_text::Family<'static> {
     match family {
         font::Family::Name(name) => cosmic_text::Family::Name(name),

graphics/src/text/editor.rs

@@ -9,6 +9,7 @@ use crate::text;
 
 use cosmic_text::Edit as _;
 
+use crate::text::to_wrap;
 use std::fmt;
 use std::sync::{self, Arc};
 
@@ -435,6 +436,7 @@ impl editor::Editor for Editor {
         &mut self,
         new_bounds: Size,
         new_font: Font,
+        new_wrapping: text::Wrapping,
         new_size: Pixels,
         new_line_height: LineHeight,
         new_highlighter: &mut impl Highlighter,
@@ -492,6 +494,13 @@ impl editor::Editor for Editor {
             );
         }
 
+        let new_wrap = to_wrap(new_wrapping);
+        if new_wrap != buffer_from_editor(&internal.editor).wrap() {
+            log::trace!("Updating wrapping strategy of `Editor`...");
+            buffer_mut_from_editor(&mut internal.editor)
+                .set_wrap(font_system.raw(), new_wrap);
+        }
+
         if new_bounds != internal.bounds {
             log::trace!("Updating size of `Editor`...");
 

graphics/src/text/paragraph.rs

@@ -5,6 +5,7 @@ use crate::core::text::{Hit, Shaping, Span, Text};
 use crate::core::{Font, Point, Rectangle, Size};
 use crate::text;
 
+use iced_core::text::Wrapping;
 use std::fmt;
 use std::sync::{self, Arc};
 
@@ -22,6 +23,7 @@ struct Internal {
     bounds: Size,
     min_bounds: Size,
     version: text::Version,
+    wrapping: Wrapping,
 }
 
 impl Paragraph {
@@ -86,6 +88,8 @@ impl core::text::Paragraph for Paragraph {
             text::to_shaping(text.shaping),
         );
 
+        buffer.set_wrap(font_system.raw(), text::to_wrap(text.wrapping));
+
         let min_bounds = text::measure(&buffer);
 
         Self(Arc::new(Internal {
@@ -97,6 +101,7 @@ impl core::text::Paragraph for Paragraph {
             bounds: text.bounds,
             min_bounds,
             version: font_system.version(),
+            wrapping: text.wrapping,
         }))
     }
 
@@ -163,6 +168,7 @@ impl core::text::Paragraph for Paragraph {
             bounds: text.bounds,
             min_bounds,
             version: font_system.version(),
+            wrapping: text.wrapping,
         }))
     }
 
@@ -194,6 +200,7 @@ impl core::text::Paragraph for Paragraph {
             || paragraph.shaping != text.shaping
             || paragraph.horizontal_alignment != text.horizontal_alignment
             || paragraph.vertical_alignment != text.vertical_alignment
+            || paragraph.wrapping != text.wrapping
         {
             core::text::Difference::Shape
         } else if paragraph.bounds != text.bounds {
@@ -362,6 +369,7 @@ impl fmt::Debug for Paragraph {
             .field("vertical_alignment", &paragraph.vertical_alignment)
             .field("bounds", &paragraph.bounds)
             .field("min_bounds", &paragraph.min_bounds)
+            .field("wrapping", &paragraph.wrapping)
             .finish()
     }
 }
@@ -375,6 +383,7 @@ impl PartialEq for Internal {
             && self.bounds == other.bounds
             && self.min_bounds == other.min_bounds
             && self.buffer.metrics() == other.buffer.metrics()
+            && self.wrapping == other.wrapping
     }
 }
 
@@ -392,6 +401,7 @@ impl Default for Internal {
             bounds: Size::ZERO,
             min_bounds: Size::ZERO,
             version: text::Version::default(),
+            wrapping: Wrapping::default(),
         }
     }
 }

wgpu/src/lib.rs

@@ -408,6 +408,7 @@ impl Renderer {
                         horizontal_alignment: alignment::Horizontal::Left,
                         vertical_alignment: alignment::Vertical::Top,
                         shaping: core::text::Shaping::Basic,
+                        wrapping: core::text::Wrapping::default(),
                     };
 
                     renderer.fill_text(

widget/src/checkbox.rs

@@ -5,6 +5,7 @@ use crate::core::layout;
 use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::text;
+use crate::core::text::Wrapping;
 use crate::core::theme::palette;
 use crate::core::touch;
 use crate::core::widget;
@@ -240,6 +241,7 @@ where
                     alignment::Horizontal::Left,
                     alignment::Vertical::Top,
                     self.text_shaping,
+                    Wrapping::default(),
                 )
             },
         )
@@ -348,6 +350,7 @@ where
                         horizontal_alignment: alignment::Horizontal::Center,
                         vertical_alignment: alignment::Vertical::Center,
                         shaping: *shaping,
+                        wrapping: Wrapping::default(),
                     },
                     bounds.center(),
                     style.icon_color,

widget/src/overlay/menu.rs

@@ -532,6 +532,7 @@ where
                     horizontal_alignment: alignment::Horizontal::Left,
                     vertical_alignment: alignment::Vertical::Center,
                     shaping: self.text_shaping,
+                    wrapping: text::Wrapping::default(),
                 },
                 Point::new(bounds.x + self.padding.left, bounds.center_y()),
                 if is_selected {

widget/src/pick_list.rs

@@ -250,6 +250,7 @@ where
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,
             shaping: self.text_shaping,
+            wrapping: text::Wrapping::default(),
         };
 
         for (option, paragraph) in options.iter().zip(state.options.iter_mut())
@@ -515,6 +516,7 @@ where
                     horizontal_alignment: alignment::Horizontal::Right,
                     vertical_alignment: alignment::Vertical::Center,
                     shaping,
+                    wrapping: text::Wrapping::default(),
                 },
                 Point::new(
                     bounds.x + bounds.width - self.padding.right,
@@ -544,6 +546,7 @@ where
                     horizontal_alignment: alignment::Horizontal::Left,
                     vertical_alignment: alignment::Vertical::Center,
                     shaping: self.text_shaping,
+                    wrapping: text::Wrapping::default(),
                 },
                 Point::new(bounds.x + self.padding.left, bounds.center_y()),
                 if is_selected {