Skip to content

Commit dfdf8bb

Browse files
committed
Use Parley main
1 parent effb9d9 commit dfdf8bb

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

packages/blitz-paint/src/render.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,25 @@ use blitz_dom::node::{
1515
ListItemLayout, ListItemLayoutPosition, Marker, NodeData, RasterImageData, TextInputData,
1616
TextNodeData,
1717
};
18-
use blitz_dom::{BaseDocument, ElementData, Node, local_name};
18+
use blitz_dom::{local_name, BaseDocument, ElementData, Node};
1919
use blitz_traits::devtools::DevtoolSettings;
2020

2121
use euclid::Transform3D;
2222
use style::values::computed::BorderCornerRadius;
2323
use style::{
2424
dom::TElement,
2525
properties::{
26-
ComputedValues, generated::longhands::visibility::computed_value::T as StyloVisibility,
27-
style_structs::Font,
26+
generated::longhands::visibility::computed_value::T as StyloVisibility,
27+
style_structs::Font, ComputedValues,
2828
},
2929
values::{
3030
computed::{CSSPixelLength, Overflow},
31-
specified::{BorderStyle, OutlineStyle, image::ImageRendering},
31+
specified::{image::ImageRendering, BorderStyle, OutlineStyle},
3232
},
3333
};
3434

3535
use kurbo::{self, Affine, Insets, Point, Rect, Stroke, Vec2};
36+
use parley::BoundingBox;
3637
use peniko::{self, Fill, ImageData, ImageSampler};
3738
use style::values::generics::color::GenericColor;
3839
use taffy::Layout;
@@ -400,9 +401,9 @@ struct ElementCx<'a> {
400401
devtools: &'a DevtoolSettings,
401402
}
402403

403-
/// Converts parley BoundingBox into peniko Rect
404+
/// Convert `parley::BoundingBox` to `kurbo::Rect`
404405
fn convert_rect(rect: &parley::BoundingBox) -> kurbo::Rect {
405-
peniko::kurbo::Rect::new(rect.x0, rect.y0, rect.x1, rect.y1)
406+
kurbo::Rect::new(rect.x0, rect.y0, rect.x1, rect.y1)
406407
}
407408

408409
impl ElementCx<'_> {
@@ -433,13 +434,13 @@ impl ElementCx<'_> {
433434

434435
if self.node.is_focussed() {
435436
// Render selection/caret
436-
for (rect, _line_idx) in input_data.editor.selection_geometry().iter() {
437+
for (bb, _line_idx) in input_data.editor.selection_geometry().iter() {
437438
scene.fill(
438439
Fill::NonZero,
439440
transform,
440441
color::palette::css::STEEL_BLUE,
441442
None,
442-
&convert_rect(rect),
443+
&convert_rect(bb),
443444
);
444445
}
445446
if let Some(cursor) = input_data.editor.cursor_geometry(1.5) {

0 commit comments

Comments
 (0)