caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-15 17:45:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: respect RTL cell drawing order in grid layout

Browse Source
This commit is contained in:
Tobias Schmitz 2025-05-02 14:12:40 +02:00
parent 14241ec1aa
commit 62e6c97df5
No known key found for this signature in database
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/typst-layout/src/grid/layouter.rs
View File

@ -1236,10 +1236,9 @@ impl<'a> GridLayouter<'a> {
} }
let mut output = Frame::soft(Size::new(self.width, height)); let mut output = Frame::soft(Size::new(self.width, height));
let mut pos = Point::zero(); let mut offset = Point::zero();
// Reverse the column order when using RTL. for (x, &rcol) in self.rcols.iter().enumerate() {
for (x, &rcol) in self.rcols.iter().enumerate().rev_if(self.is_rtl) {
if let Some(cell) = self.grid.cell(x, y) { if let Some(cell) = self.grid.cell(x, y) {
// Rowspans have a separate layout step // Rowspans have a separate layout step
if cell.rowspan.get() == 1 { if cell.rowspan.get() == 1 {
@ -1257,25 +1256,17 @@ impl<'a> GridLayouter<'a> {
let frame = let frame =
layout_cell(cell, engine, disambiguator, self.styles, pod)? layout_cell(cell, engine, disambiguator, self.styles, pod)?
.into_frame(); .into_frame();
let mut pos = pos; let mut pos = offset;
if self.is_rtl { if self.is_rtl {
// In the grid, cell colspans expand to the right, // In RTL cells expand to the left, thus the position
// so we're at the leftmost (lowest 'x') column // must additionally be offset by the width of the column.
// spanned by the cell. However, in RTL, cells pos.x = self.width - (pos.x + width);
// expand to the left. Therefore, without the
// offset below, the cell's contents would be laid out
// starting at its rightmost visual position and extend
// over to unrelated cells to its right in RTL.
// We avoid this by ensuring the rendered cell starts at
// the very left of the cell, even with colspan > 1.
let offset = -width + rcol;
pos.x += offset;
} }
output.push_frame(pos, frame); output.push_frame(pos, frame);
} }
} }
pos.x += rcol; offset.x += rcol;
} }
Ok(output) Ok(output)
@ -1302,8 +1293,8 @@ impl<'a> GridLayouter<'a> {
pod.backlog = &heights[1..]; pod.backlog = &heights[1..];
// Layout the row. // Layout the row.
let mut pos = Point::zero(); let mut offset = Point::zero();
for (x, &rcol) in self.rcols.iter().enumerate().rev_if(self.is_rtl) { for (x, &rcol) in self.rcols.iter().enumerate() {
if let Some(cell) = self.grid.cell(x, y) { if let Some(cell) = self.grid.cell(x, y) {
// Rowspans have a separate layout step // Rowspans have a separate layout step
if cell.rowspan.get() == 1 { if cell.rowspan.get() == 1 {
@ -1314,17 +1305,16 @@ impl<'a> GridLayouter<'a> {
let fragment = let fragment =
layout_cell(cell, engine, disambiguator, self.styles, pod)?; layout_cell(cell, engine, disambiguator, self.styles, pod)?;
for (output, frame) in outputs.iter_mut().zip(fragment) { for (output, frame) in outputs.iter_mut().zip(fragment) {
let mut pos = pos; let mut pos = offset;
if self.is_rtl { if self.is_rtl {
let offset = -width + rcol; pos.x = self.width - (offset.x + width);
pos.x += offset;
} }
output.push_frame(pos, frame); output.push_frame(pos, frame);
} }
} }
} }
pos.x += rcol; offset.x += rcol;
} }
Ok(Fragment::frames(outputs)) Ok(Fragment::frames(outputs))