leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid breakage in LayoutRunIter::new

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2026-02-27 21:53:44 +01:00 • committed by Jeremy Soller
parent 02137a7561
commit 29034e56b4
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/buffer.rs
View file

@ -108,7 +108,17 @@ pub struct LayoutRunIter<'b> {
} }
impl<'b> LayoutRunIter<'b> { impl<'b> LayoutRunIter<'b> {
pub const fn new( pub const fn new(buffer: &'b Buffer) -> Self {
Self::from_lines(
buffer.lines.as_slice(),
buffer.height_opt,
buffer.metrics.line_height,
buffer.scroll.vertical,
buffer.scroll.line,
)
}
pub const fn from_lines(
lines: &'b [BufferLine], lines: &'b [BufferLine],
height_opt: Option<f32>, height_opt: Option<f32>,
line_height: f32, line_height: f32,
@ -935,13 +945,7 @@ impl Buffer {
/// Get the visible layout runs for rendering and other tasks /// Get the visible layout runs for rendering and other tasks
pub fn layout_runs(&self) -> LayoutRunIter<'_> { pub fn layout_runs(&self) -> LayoutRunIter<'_> {
LayoutRunIter::new( LayoutRunIter::new(self)
&self.lines,
self.height_opt,
self.metrics.line_height,
self.scroll.vertical,
self.scroll.line,
)
} }
/// Convert x, y position to Cursor (hit detection) /// Convert x, y position to Cursor (hit detection)

2
src/buffer_line.rs
View file

@ -279,7 +279,7 @@ impl BufferLine {
/// Get the visible layout runs for rendering and other tasks /// Get the visible layout runs for rendering and other tasks
pub fn layout_runs(&self, height_opt: Option<f32>, line_height: f32) -> LayoutRunIter<'_> { pub fn layout_runs(&self, height_opt: Option<f32>, line_height: f32) -> LayoutRunIter<'_> {
LayoutRunIter::new(core::slice::from_ref(self), height_opt, line_height, 0.0, 0) LayoutRunIter::from_lines(core::slice::from_ref(self), height_opt, line_height, 0.0, 0)
} }
/// Get line metadata. This will be None if [`BufferLine::set_metadata`] has not been called /// Get line metadata. This will be None if [`BufferLine::set_metadata`] has not been called