Rename TextWrapping::max_lines to max_rows

Author: awaken1ng

egui_demo_lib/src/apps/demo/misc_demo_window.rs

@@ -9,7 +9,7 @@ pub struct MiscDemoWindow {
     num_columns: usize,
 
     break_anywhere: bool,
-    max_lines: usize,
+    max_rows: usize,
     overflow_character: char,
 
     widgets: Widgets,
@@ -23,7 +23,7 @@ impl Default for MiscDemoWindow {
         MiscDemoWindow {
             num_columns: 2,
 
-            max_lines: 2,
+            max_rows: 2,
             break_anywhere: false,
             overflow_character: '…',
 
@@ -64,7 +64,7 @@ impl View for MiscDemoWindow {
             .show(ui, |ui| {
                 text_layout_ui(
                     ui,
-                    &mut self.max_lines,
+                    &mut self.max_rows,
                     &mut self.break_anywhere,
                     &mut self.overflow_character,
                 );
@@ -417,7 +417,7 @@ impl SubTree {
 
 fn text_layout_ui(
     ui: &mut egui::Ui,
-    max_lines: &mut usize,
+    max_rows: &mut usize,
     break_anywhere: &mut bool,
     overflow_character: &mut char,
 ) {
@@ -578,8 +578,8 @@ fn text_layout_ui(
     ui.separator();
 
     ui.horizontal(|ui| {
-        ui.add(DragValue::new(max_lines));
-        ui.label("Max lines");
+        ui.add(DragValue::new(max_rows));
+        ui.label("Max rows");
     });
     ui.checkbox(break_anywhere, "Break anywhere");
     ui.horizontal(|ui| {
@@ -591,7 +591,7 @@ fn text_layout_ui(
 
     let mut job = LayoutJob::single_section(LOREM_IPSUM.to_string(), TextFormat::default());
     job.wrap = TextWrapping {
-        max_lines: *max_lines,
+        max_rows: *max_rows,
         break_anywhere: *break_anywhere,
         overflow_character: Some(*overflow_character),
         ..Default::default()

epaint/CHANGELOG.md

@@ -7,7 +7,7 @@ All notable changes to the epaint crate will be documented in this file.
   * Added `TextWrapping` struct containing all wrapping options.
   * Added `LayoutJob::wrap` field containing these options.
   * Moved `LayoutJob::wrap_width` to `TextWrapping::max_width`.
-  * Added `TextWrapping::max_lines` to limit amount of lines the text should have.
+  * Added `TextWrapping::max_rows` to limit amount of rows the text should have.
   * Added `TextWrapping::break_anywhere` to control should the text break at appropriate places or not.
   * Added `TextWrapping::overflow_character` to specify what character should be used to represent clipped text.
 

epaint/src/text/text_layout.rs

@@ -197,7 +197,7 @@ fn line_break(
     for (i, glyph) in paragraph.glyphs.iter().enumerate() {
         let potential_row_width = glyph.max_x() - row_start_x;
 
-        if job.wrap.max_lines > 0 && non_empty_rows >= job.wrap.max_lines {
+        if job.wrap.max_rows > 0 && non_empty_rows >= job.wrap.max_rows {
             break;
         }
 
@@ -247,7 +247,7 @@ fn line_break(
     }
 
     if row_start_idx < paragraph.glyphs.len() {
-        if non_empty_rows == job.wrap.max_lines {
+        if non_empty_rows == job.wrap.max_rows {
             if let (Some(overflow_character), Some(row)) =
                 (job.wrap.overflow_character, out_rows.last_mut())
             {

epaint/src/text/text_layout_types.rs

@@ -267,7 +267,7 @@ pub struct TextWrapping {
 
     /// Maximum amount of rows the text should have.
     /// Set to `0` to disable this.
-    pub max_lines: usize,
+    pub max_rows: usize,
 
     /// Don't try to break text at an appropriate place.
     pub break_anywhere: bool,
@@ -281,12 +281,12 @@ impl std::hash::Hash for TextWrapping {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
         let Self {
             max_width,
-            max_lines,
+            max_rows,
             break_anywhere,
             overflow_character,
         } = self;
         crate::f32_hash(state, *max_width);
-        max_lines.hash(state);
+        max_rows.hash(state);
         break_anywhere.hash(state);
         overflow_character.hash(state);
     }
@@ -296,7 +296,7 @@ impl Default for TextWrapping {
     fn default() -> Self {
         Self {
             max_width: f32::INFINITY,
-            max_lines: 0,
+            max_rows: 0,
             break_anywhere: false,
             overflow_character: None,
         }