diff --git a/crates/vendor/i-slint-renderer-femtovg-1.16.1/itemrenderer.rs b/crates/vendor/i-slint-renderer-femtovg-1.16.1/itemrenderer.rs index 623ad8d8a..4690b0c55 100644 --- a/crates/vendor/i-slint-renderer-femtovg-1.16.1/itemrenderer.rs +++ b/crates/vendor/i-slint-renderer-femtovg-1.16.1/itemrenderer.rs @@ -13,15 +13,15 @@ use i_slint_core::graphics::euclid::{self}; use i_slint_core::graphics::rendering_metrics_collector::RenderingMetrics; use i_slint_core::graphics::{IntRect, Point, Size}; use i_slint_core::item_rendering::{ - CachedRenderingData, ItemCache, ItemRenderer, RenderBorderRectangle, RenderImage, - RenderRectangle, RenderText, + CachedRenderingData, ItemCache, ItemRenderer, ItemRendererFeatures, RenderBorderRectangle, + RenderImage, RenderRectangle, RenderText, }; use i_slint_core::items::{ self, Clip, FillRule, ImageRendering, ImageTiling, ItemRc, Layer, Opacity, RenderingResult, }; use i_slint_core::lengths::{ - LogicalBorderRadius, LogicalLength, LogicalPoint, LogicalRect, LogicalSize, LogicalVector, - RectLengths, ScaleFactor, logical_size_from_api, + ItemTransform, LogicalBorderRadius, LogicalLength, LogicalPoint, LogicalRect, LogicalSize, + LogicalVector, RectLengths, ScaleFactor, logical_size_from_api, }; use i_slint_core::textlayout::sharedparley::{self, GlyphRenderer, fontique, parley}; use i_slint_core::{Brush, Color, ImageInner, SharedString}; @@ -89,6 +89,11 @@ struct State { scissor: LogicalRect, global_alpha: f32, current_render_target: femtovg::RenderTarget, + // #617 partial-rendering scaffold (stage 1): track the item-tree transform in + // logical space, exactly like the Skia renderer's RenderState, so the core + // PartialRenderer proxy can query `current_transform()`. Inert until partial + // rendering is wired (stage 3). + transform: ItemTransform, } pub struct GLItemRenderer<'a, R: femtovg::Renderer + TextureImporter> { @@ -759,6 +764,13 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer self.canvas.borrow_mut().restore(); } + // #617 partial-rendering scaffold (stage 1): the core PartialRenderer proxy + // needs the current item-tree transform (the trait default is `todo!()`). + // Mirrors the Skia renderer. Inert until partial rendering is wired. + fn current_transform(&self) -> ItemTransform { + self.state.last().unwrap().transform + } + fn scale_factor(&self) -> f32 { self.scale_factor.get() } @@ -883,14 +895,18 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer fn translate(&mut self, distance: LogicalVector) { let physical_distance = distance * self.scale_factor; self.canvas.borrow_mut().translate(physical_distance.x, physical_distance.y); - let clip = &mut self.state.last_mut().unwrap().scissor; + let state = self.state.last_mut().unwrap(); + state.transform = state.transform.pre_translate(distance.cast()); + let clip = &mut state.scissor; *clip = clip.translate(-distance) } fn rotate(&mut self, angle_in_degrees: f32) { let angle_in_radians = angle_in_degrees.to_radians(); self.canvas.borrow_mut().rotate(angle_in_radians); - let clip = &mut self.state.last_mut().unwrap().scissor; + let state = self.state.last_mut().unwrap(); + state.transform = state.transform.pre_rotate(euclid::Angle::degrees(angle_in_degrees)); + let clip = &mut state.scissor; // Compute the bounding box of the rotated rectangle let (sin, cos) = (-angle_in_radians).sin_cos(); let rotate_point = |p: LogicalPoint| (p.x * cos - p.y * sin, p.x * sin + p.y * cos); @@ -915,7 +931,9 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer fn scale(&mut self, x_factor: f32, y_factor: f32) { self.canvas.borrow_mut().scale(x_factor, y_factor); - let clip = &mut self.state.last_mut().unwrap().scissor; + let state = self.state.last_mut().unwrap(); + state.transform = state.transform.pre_scale(x_factor, y_factor); + let clip = &mut state.scissor; clip.origin.x /= x_factor; clip.origin.y /= y_factor; clip.size.width /= x_factor; @@ -929,6 +947,14 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer } } +// #617 partial-rendering scaffold (stage 1): advertise transform support so the +// core `PartialRenderer` proxy can wrap this renderer. Mirrors the +// Skia renderer's impl (`SUPPORTS_TRANSFORMATIONS = true`). Inert until partial +// rendering is wired (stage 3). +impl<'a, R: femtovg::Renderer + TextureImporter> ItemRendererFeatures for GLItemRenderer<'a, R> { + const SUPPORTS_TRANSFORMATIONS: bool = true; +} + #[derive(Clone)] pub enum GlyphBrush { Fill(femtovg::Paint), @@ -1060,6 +1086,7 @@ impl<'a, R: femtovg::Renderer + TextureImporter> GLItemRenderer<'a, R> { ), global_alpha: 1., current_render_target: femtovg::RenderTarget::Screen, + transform: ItemTransform::identity(), }], metrics: RenderingMetrics { layers_created: Some(0), ..Default::default() }, } @@ -1151,6 +1178,10 @@ impl<'a, R: femtovg::Renderer + TextureImporter> GLItemRenderer<'a, R> { scissor: bounding_rect, global_alpha: 1., current_render_target: layer_image.as_render_target(), + // Layer renders into its own offscreen target with the canvas + // translated by -origin; identity is a safe placeholder here while + // this is inert. Revisit when stage 3 wires layer dirty-tracking. + transform: ItemTransform::identity(), }; let window_adapter = self.window().window_adapter();