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

refactor: also change the drawing order in render_fills_strokes

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

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

@ -11,7 +11,7 @@ use typst_library::layout::{
use typst_library::text::TextElem; use typst_library::text::TextElem;
use typst_library::visualize::Geometry; use typst_library::visualize::Geometry;
use typst_syntax::Span; use typst_syntax::Span;
use typst_utils::{MaybeReverseIter, Numeric}; use typst_utils::Numeric;
use super::{ use super::{
generate_line_segments, hline_stroke_at_column, layout_cell, vline_stroke_at_row, generate_line_segments, hline_stroke_at_column, layout_cell, vline_stroke_at_row,
@ -574,7 +574,7 @@ impl<'a> GridLayouter<'a> {
// Reverse with RTL so that later columns start first. // Reverse with RTL so that later columns start first.
let mut dx = Abs::zero(); let mut dx = Abs::zero();
for (x, &col) in self.rcols.iter().enumerate().rev_if(self.is_rtl) { for (x, &col) in self.rcols.iter().enumerate() {
let mut dy = Abs::zero(); let mut dy = Abs::zero();
for row in rows { for row in rows {
// We want to only draw the fill starting at the parent // We want to only draw the fill starting at the parent
@ -643,18 +643,12 @@ impl<'a> GridLayouter<'a> {
.sum() .sum()
}; };
let width = self.cell_spanned_width(cell, x); let width = self.cell_spanned_width(cell, x);
// In the grid, cell colspans expand to the right, let mut pos = Point::new(dx, dy);
// so we're at the leftmost (lowest 'x') column if self.is_rtl {
// spanned by the cell. However, in RTL, cells // In RTL cells expand to the left, thus the position
// expand to the left. Therefore, without the // must additionally be offset by the width of the column.
// offset below, cell fills would start at the pos.x = self.width - (dx + width);
// rightmost visual position of a cell and extend }
// over to unrelated columns to the right in RTL.
// We avoid this by ensuring the fill starts at the
// very left of the cell, even with colspan > 1.
let offset =
if self.is_rtl { -width + col } else { Abs::zero() };
let pos = Point::new(dx + offset, dy);
let size = Size::new(width, height); let size = Size::new(width, height);
let rect = Geometry::Rect(size).filled(fill); let rect = Geometry::Rect(size).filled(fill);
fills.push((pos, FrameItem::Shape(rect, self.span))); fills.push((pos, FrameItem::Shape(rect, self.span)));