Add text::Wrapping support

iced-rs · Sep 6, 2024 · 60010f4 · 60010f4
1 parent 8c0f4c1
commit 60010f4
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/widget/card.rs b/src/widget/card.rs
@@ -11,12 +11,7 @@ use iced::{
  text::LineHeight,
  widget::{Operation, Tree},
  Clipboard, Layout, Shell, Widget,
- },
- alignment::{Horizontal, Vertical},
- event,
- mouse::{self, Cursor},
- touch, Alignment, Border, Color, Element, Event, Length, Padding, Pixels, Point, Rectangle,
- Shadow, Size, Vector,
+ }, alignment::{Horizontal, Vertical}, event, mouse::{self, Cursor}, touch, widget::text::Wrapping, Alignment, Border, Color, Element, Event, Length, Padding, Pixels, Point, Rectangle, Shadow, Size, Vector
 };
 
 pub use crate::style::{
@@ -841,6 +836,7 @@ fn draw_head<Message, Theme, Renderer>(
  vertical_alignment: Vertical::Center,
  line_height: LineHeight::Relative(1.3),
  shaping: iced::advanced::text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(close_bounds.center_x(), close_bounds.center_y()),
  style.close_color,

diff --git a/src/widget/number_input.rs b/src/widget/number_input.rs
@@ -15,7 +15,7 @@ use iced::{
  event, keyboard,
  mouse::{self, Cursor},
  widget::{
- text::LineHeight,
+ text::{LineHeight, Wrapping},
  text_input::{self, cursor, Value},
  Column, Container, Row, Text,
  },
@@ -752,6 +752,7 @@ where
  vertical_alignment: Vertical::Center,
  line_height: LineHeight::Relative(1.3),
  shaping: iced::advanced::text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(dec_bounds.center_x(), dec_bounds.center_y()),
  decrease_btn_style.icon_color,
@@ -786,6 +787,7 @@ where
  vertical_alignment: Vertical::Center,
  line_height: LineHeight::Relative(1.3),
  shaping: iced::advanced::text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(inc_bounds.center_x(), inc_bounds.center_y()),
  increase_btn_style.icon_color,

diff --git a/src/widget/overlay/color_picker.rs b/src/widget/overlay/color_picker.rs
@@ -27,7 +27,8 @@ use iced::{
  touch,
  widget::{
  canvas::{self, LineCap, Path, Stroke},
- text, Button, Column, Row,
+ text::{self, Wrapping},
+ Button, Column, Row,
  },
  Alignment, Border, Color, Element, Event, Length, Padding, Pixels, Point, Rectangle, Renderer,
  Shadow, Size, Vector,
@@ -1427,6 +1428,7 @@ fn rgba_color(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(
  label_layout.bounds().center_x(),
@@ -1510,6 +1512,7 @@ fn rgba_color(
  vertical_alignment: Vertical::Center,
  line_height: iced::widget::text::LineHeight::Relative(1.3),
  shaping: iced::widget::text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(
  value_layout.bounds().center_x(),
@@ -1651,6 +1654,7 @@ fn hex_text(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(bounds.center_x(), bounds.center_y()),
  Color {

diff --git a/src/widget/overlay/date_picker.rs b/src/widget/overlay/date_picker.rs
@@ -26,7 +26,7 @@ use iced::{
  keyboard,
  mouse::{self, Cursor},
  touch,
- widget::{text, Button, Column, Container, Row, Text},
+ widget::{text::{self, Wrapping}, Button, Column, Container, Row, Text},
  Alignment,
  Border,
  Color,
@@ -1170,6 +1170,7 @@ fn month_year(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(left_bounds.center_x(), left_bounds.center_y()),
  style
@@ -1190,6 +1191,7 @@ fn month_year(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(center_bounds.center_x(), center_bounds.center_y()),
  style
@@ -1210,6 +1212,7 @@ fn month_year(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(right_bounds.center_x(), right_bounds.center_y()),
  style
@@ -1279,6 +1282,7 @@ fn day_labels(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(bounds.center_x(), bounds.center_y()),
  style
@@ -1371,6 +1375,7 @@ fn day_table(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(bounds.center_x(), bounds.center_y()),
  if is_in_month == IsInMonth::Same {

diff --git a/src/widget/overlay/time_picker.rs b/src/widget/overlay/time_picker.rs
@@ -39,7 +39,7 @@ use iced::{
  widget::{
  button,
  canvas::{self, LineCap, Path, Stroke, Text as CanvasText},
- container, text, Button, Column, Container, Row,
+ container, text::{self, Wrapping}, Button, Column, Container, Row,
  },
  Alignment,
  Border,
@@ -1481,6 +1481,7 @@ fn draw_digital_clock<Message, Theme>(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(up_bounds.center_x(), up_bounds.center_y()),
  style
@@ -1501,6 +1502,7 @@ fn draw_digital_clock<Message, Theme>(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(center_bounds.center_x(), center_bounds.center_y()),
  style
@@ -1524,6 +1526,7 @@ fn draw_digital_clock<Message, Theme>(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(down_bounds.center_x(), down_bounds.center_y()),
  style
@@ -1575,6 +1578,7 @@ fn draw_digital_clock<Message, Theme>(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(
  hour_minute_separator.bounds().center_x(),
@@ -1613,6 +1617,7 @@ fn draw_digital_clock<Message, Theme>(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(
  minute_second_separator.bounds().center_x(),
@@ -1653,6 +1658,7 @@ fn draw_digital_clock<Message, Theme>(
  vertical_alignment: Vertical::Center,
  line_height: text::LineHeight::Relative(1.3),
  shaping: text::Shaping::Basic,
+ wrapping: Wrapping::default(),
  },
  Point::new(period.bounds().center_x(), period.bounds().center_y()),
  style[&StyleState::Active].text_color,

diff --git a/src/widget/selection_list.rs b/src/widget/selection_list.rs
@@ -18,7 +18,7 @@ use iced::{
  mouse::{self, Cursor},
  widget::{
  container, scrollable,
- text::{self, LineHeight},
+ text::{self, LineHeight, Wrapping},
  Container, Scrollable,
  },
  Border, Element, Event, Font, Length, Padding, Pixels, Rectangle, Shadow, Size,
@@ -229,6 +229,7 @@ where
  horizontal_alignment: Horizontal::Left,
  vertical_alignment: Vertical::Top,
  shaping: text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  };
 
  state.values[id].update(text);

diff --git a/src/widget/selection_list/list.rs b/src/widget/selection_list/list.rs
@@ -16,7 +16,7 @@ use iced::{
  event,
  mouse::{self, Cursor},
  touch,
- widget::text::LineHeight,
+ widget::text::{LineHeight, Wrapping},
  Border, Color, Element, Event, Length, Padding, Pixels, Point, Rectangle, Shadow, Size,
 };
 use std::{
@@ -277,6 +277,7 @@ where
  vertical_alignment: Vertical::Center,
  line_height: LineHeight::default(),
  shaping: iced::widget::text::Shaping::Advanced,
+ wrapping: Wrapping::default(),
  },
  Point::new(bounds.x, bounds.center_y()),
  text_color,