diff --git a/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.cpp b/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.cpp index 94dcc678da165fbacc8876e0ca65b559de6c1d8f..39ff441d951e50906e4b73c2ec9832f30e192b3d 100644 --- a/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.cpp +++ b/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.cpp @@ -123,9 +123,7 @@ void CustomPaintPattern::SetAntiAlias(bool isEnabled) paintMethod.SetAntiAlias(isEnabled); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::FillRect(const Rect& rect) @@ -134,9 +132,7 @@ void CustomPaintPattern::FillRect(const Rect& rect) paintMethod.FillRect(paintWrapper, rect); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::StrokeRect(const Rect& rect) @@ -145,9 +141,7 @@ void CustomPaintPattern::StrokeRect(const Rect& rect) paintMethod.StrokeRect(paintWrapper, rect); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::ClearRect(const Rect& rect) @@ -156,10 +150,7 @@ void CustomPaintPattern::ClearRect(const Rect& rect) paintMethod.ClearRect(paintWrapper, rect); }; paintMethod_->PushTask(task); - - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Fill() @@ -168,9 +159,7 @@ void CustomPaintPattern::Fill() paintMethod.Fill(paintWrapper); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Fill(const RefPtr& path) @@ -179,9 +168,7 @@ void CustomPaintPattern::Fill(const RefPtr& path) paintMethod.Fill(paintWrapper, path); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Stroke() @@ -190,9 +177,7 @@ void CustomPaintPattern::Stroke() paintMethod.Stroke(paintWrapper); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Stroke(const RefPtr& path) @@ -201,9 +186,7 @@ void CustomPaintPattern::Stroke(const RefPtr& path) paintMethod.Stroke(paintWrapper, path); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Clip() @@ -212,9 +195,7 @@ void CustomPaintPattern::Clip() paintMethod.Clip(); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Clip(const RefPtr& path) @@ -223,9 +204,7 @@ void CustomPaintPattern::Clip(const RefPtr& path) paintMethod.Clip(path); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::BeginPath() @@ -234,9 +213,7 @@ void CustomPaintPattern::BeginPath() paintMethod.BeginPath(); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::ClosePath() @@ -245,9 +222,7 @@ void CustomPaintPattern::ClosePath() paintMethod.ClosePath(); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::MoveTo(double x, double y) @@ -256,9 +231,7 @@ void CustomPaintPattern::MoveTo(double x, double y) paintMethod.MoveTo(paintWrapper, x, y); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::LineTo(double x, double y) @@ -267,9 +240,7 @@ void CustomPaintPattern::LineTo(double x, double y) paintMethod.LineTo(paintWrapper, x, y); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Arc(const ArcParam& param) @@ -278,9 +249,7 @@ void CustomPaintPattern::Arc(const ArcParam& param) paintMethod.Arc(paintWrapper, param); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::ArcTo(const ArcToParam& param) @@ -289,9 +258,7 @@ void CustomPaintPattern::ArcTo(const ArcToParam& param) paintMethod.ArcTo(paintWrapper, param); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::AddRect(const Rect& rect) @@ -300,9 +267,7 @@ void CustomPaintPattern::AddRect(const Rect& rect) paintMethod.AddRect(paintWrapper, rect); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Ellipse(const EllipseParam& param) @@ -311,9 +276,7 @@ void CustomPaintPattern::Ellipse(const EllipseParam& param) paintMethod.Ellipse(paintWrapper, param); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::BezierCurveTo(const BezierCurveParam& param) @@ -322,9 +285,7 @@ void CustomPaintPattern::BezierCurveTo(const BezierCurveParam& param) paintMethod.BezierCurveTo(paintWrapper, param); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::QuadraticCurveTo(const QuadraticCurveParam& param) @@ -333,9 +294,7 @@ void CustomPaintPattern::QuadraticCurveTo(const QuadraticCurveParam& param) paintMethod.QuadraticCurveTo(paintWrapper, param); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::FillText(const std::string& text, double x, double y, std::optional maxWidth) @@ -344,9 +303,7 @@ void CustomPaintPattern::FillText(const std::string& text, double x, double y, s paintMethod.FillText(paintWrapper, text, x, y, maxWidth); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::StrokeText(const std::string& text, double x, double y, std::optional maxWidth) @@ -355,9 +312,7 @@ void CustomPaintPattern::StrokeText(const std::string& text, double x, double y, paintMethod.StrokeText(paintWrapper, text, x, y, maxWidth); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } double CustomPaintPattern::MeasureText(const std::string& text, const PaintState& state) @@ -381,9 +336,7 @@ void CustomPaintPattern::DrawImage(const Ace::CanvasImage& image, double width, paintMethod.DrawImage(paintWrapper, image, width, height); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::DrawSvgImage( @@ -393,9 +346,7 @@ void CustomPaintPattern::DrawSvgImage( paintMethod.DrawSvgImage(paintWrapper, svgDom, image, imageFit); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::DrawPixelMap(RefPtr pixelMap, const Ace::CanvasImage& image) @@ -404,9 +355,7 @@ void CustomPaintPattern::DrawPixelMap(RefPtr pixelMap, const Ace::Canv paintMethod.DrawPixelMap(pixelMap, image); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } std::unique_ptr CustomPaintPattern::GetImageData(double left, double top, double width, double height) @@ -448,9 +397,7 @@ void CustomPaintPattern::PutImageData(const Ace::ImageData& imageData) paintMethod.PutImageData(paintWrapper, imageData); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::TransferFromImageBitmap(const RefPtr& offscreenCanvasPattern) @@ -459,9 +406,7 @@ void CustomPaintPattern::TransferFromImageBitmap(const RefPtrPushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::CloseImageBitmap(const std::string& src) @@ -475,9 +420,7 @@ void CustomPaintPattern::UpdateGlobalAlpha(double alpha) paintMethod.SetAlpha(alpha); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateCompositeOperation(CompositeOperation type) @@ -486,9 +429,7 @@ void CustomPaintPattern::UpdateCompositeOperation(CompositeOperation type) paintMethod.SetCompositeType(type); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateSmoothingEnabled(bool enabled) @@ -497,9 +438,7 @@ void CustomPaintPattern::UpdateSmoothingEnabled(bool enabled) paintMethod.SetSmoothingEnabled(enabled); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateSmoothingQuality(const std::string& quality) @@ -508,9 +447,7 @@ void CustomPaintPattern::UpdateSmoothingQuality(const std::string& quality) paintMethod.SetSmoothingQuality(quality); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateLineCap(LineCapStyle cap) @@ -519,9 +456,7 @@ void CustomPaintPattern::UpdateLineCap(LineCapStyle cap) paintMethod.SetLineCap(cap); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateLineDashOffset(double dash) @@ -530,9 +465,7 @@ void CustomPaintPattern::UpdateLineDashOffset(double dash) paintMethod.SetLineDashOffset(dash); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateLineJoin(LineJoinStyle join) @@ -541,9 +474,7 @@ void CustomPaintPattern::UpdateLineJoin(LineJoinStyle join) paintMethod.SetLineJoin(join); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateLineWidth(double width) @@ -552,9 +483,7 @@ void CustomPaintPattern::UpdateLineWidth(double width) paintMethod.SetLineWidth(width); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateMiterLimit(double limit) @@ -563,9 +492,7 @@ void CustomPaintPattern::UpdateMiterLimit(double limit) paintMethod.SetMiterLimit(limit); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateShadowBlur(double blur) @@ -574,9 +501,7 @@ void CustomPaintPattern::UpdateShadowBlur(double blur) paintMethod.SetShadowBlur(blur); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateShadowColor(const Color& color) @@ -585,9 +510,7 @@ void CustomPaintPattern::UpdateShadowColor(const Color& color) paintMethod.SetShadowColor(color); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateShadowOffsetX(double offsetX) @@ -596,9 +519,7 @@ void CustomPaintPattern::UpdateShadowOffsetX(double offsetX) paintMethod.SetShadowOffsetX(offsetX); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateShadowOffsetY(double offsetY) @@ -607,9 +528,7 @@ void CustomPaintPattern::UpdateShadowOffsetY(double offsetY) paintMethod.SetShadowOffsetY(offsetY); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateTextAlign(TextAlign align) @@ -618,9 +537,7 @@ void CustomPaintPattern::UpdateTextAlign(TextAlign align) paintMethod.SetTextAlign(align); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateTextBaseline(TextBaseline baseline) @@ -629,9 +546,7 @@ void CustomPaintPattern::UpdateTextBaseline(TextBaseline baseline) paintMethod.SetTextBaseline(baseline); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateStrokePattern(const std::weak_ptr& pattern) @@ -640,9 +555,7 @@ void CustomPaintPattern::UpdateStrokePattern(const std::weak_ptr& paintMethod.SetStrokePatternNG(pattern); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateStrokeColor(const Color& color) @@ -651,9 +564,7 @@ void CustomPaintPattern::UpdateStrokeColor(const Color& color) paintMethod.SetStrokeColor(color); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateStrokeGradient(const Ace::Gradient& grad) @@ -662,9 +573,7 @@ void CustomPaintPattern::UpdateStrokeGradient(const Ace::Gradient& grad) paintMethod.SetStrokeGradient(grad); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFontWeight(FontWeight weight) @@ -673,9 +582,7 @@ void CustomPaintPattern::UpdateFontWeight(FontWeight weight) paintMethod.SetFontWeight(weight); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFontStyle(FontStyle style) @@ -684,9 +591,7 @@ void CustomPaintPattern::UpdateFontStyle(FontStyle style) paintMethod.SetFontStyle(style); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFontFamilies(const std::vector& families) @@ -695,9 +600,7 @@ void CustomPaintPattern::UpdateFontFamilies(const std::vector& fami paintMethod.SetFontFamilies(families); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFontSize(const Dimension& size) @@ -706,9 +609,7 @@ void CustomPaintPattern::UpdateFontSize(const Dimension& size) paintMethod.SetFontSize(size); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFillColor(const Color& color) @@ -717,9 +618,7 @@ void CustomPaintPattern::UpdateFillColor(const Color& color) paintMethod.SetFillColor(color); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFillGradient(const Ace::Gradient& gradient) @@ -728,9 +627,7 @@ void CustomPaintPattern::UpdateFillGradient(const Ace::Gradient& gradient) paintMethod.SetFillGradient(gradient); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFillPattern(const std::weak_ptr& pattern) @@ -739,9 +636,7 @@ void CustomPaintPattern::UpdateFillPattern(const std::weak_ptr& pa paintMethod.SetFillPatternNG(pattern); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFillRuleForPath(const CanvasFillRule rule) @@ -750,9 +645,7 @@ void CustomPaintPattern::UpdateFillRuleForPath(const CanvasFillRule rule) paintMethod.SetFillRuleForPath(rule); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::UpdateFillRuleForPath2D(const CanvasFillRule rule) @@ -761,9 +654,7 @@ void CustomPaintPattern::UpdateFillRuleForPath2D(const CanvasFillRule rule) paintMethod.SetFillRuleForPath2D(rule); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } LineDashParam CustomPaintPattern::GetLineDash() const @@ -777,9 +668,7 @@ void CustomPaintPattern::UpdateLineDash(const std::vector& segments) paintMethod.SetLineDash(segments); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Save() @@ -789,9 +678,7 @@ void CustomPaintPattern::Save() }; paintMethod_->PushTask(task); paintMethod_->SaveMatrix(); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Restore() @@ -801,9 +688,7 @@ void CustomPaintPattern::Restore() }; paintMethod_->PushTask(task); paintMethod_->RestoreMatrix(); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Scale(double x, double y) @@ -813,9 +698,7 @@ void CustomPaintPattern::Scale(double x, double y) }; paintMethod_->PushTask(task); paintMethod_->ScaleMatrix(x, y); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Rotate(double angle) @@ -825,9 +708,7 @@ void CustomPaintPattern::Rotate(double angle) }; paintMethod_->PushTask(task); paintMethod_->RotateMatrix(angle); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::SetTransform(const TransformParam& param) @@ -837,9 +718,7 @@ void CustomPaintPattern::SetTransform(const TransformParam& param) }; paintMethod_->PushTask(task); paintMethod_->SetTransformMatrix(param); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::ResetTransform() @@ -849,9 +728,7 @@ void CustomPaintPattern::ResetTransform() }; paintMethod_->PushTask(task); paintMethod_->ResetTransformMatrix(); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Transform(const TransformParam& param) @@ -861,9 +738,7 @@ void CustomPaintPattern::Transform(const TransformParam& param) }; paintMethod_->PushTask(task); paintMethod_->TransformMatrix(param); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::Translate(double x, double y) @@ -873,9 +748,7 @@ void CustomPaintPattern::Translate(double x, double y) }; paintMethod_->PushTask(task); paintMethod_->TranslateMatrix(x, y); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } std::string CustomPaintPattern::ToDataURL(const std::string& args) @@ -934,9 +807,7 @@ void CustomPaintPattern::SetFilterParam(const std::string& filterStr) paintMethod.SetFilterParam(filterStr); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } TransformParam CustomPaintPattern::GetTransform() const @@ -950,9 +821,7 @@ void CustomPaintPattern::SaveLayer() paintMethod.SaveLayer(); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::RestoreLayer() @@ -961,9 +830,7 @@ void CustomPaintPattern::RestoreLayer() paintMethod.RestoreLayer(); }; paintMethod_->PushTask(task); - auto host = GetHost(); - CHECK_NULL_VOID(host); - host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); + MarkDirty(); } void CustomPaintPattern::OnPixelRoundFinish(const SizeF& pixelGridRoundSize) @@ -1045,6 +912,12 @@ void CustomPaintPattern::CreateAnalyzerOverlay() } } +void CustomPaintPattern::MarkDirty() { + auto host = GetHost(); + CHECK_NULL_VOID(host); + host->MarkDirtyNode(PROPERTY_UPDATE_RENDER); +} + void CustomPaintPattern::UpdateAnalyzerOverlay() { auto context = GetHost()->GetRenderContext(); diff --git a/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.h b/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.h index 076ac4e22cef5e87d55e40d3e13c2f46734270be..9f2e9ce1654b88d8d8de4be05136ec348f9f455e 100644 --- a/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.h +++ b/frameworks/core/components_ng/pattern/custom_paint/custom_paint_pattern.h @@ -171,6 +171,7 @@ private: void UpdateAnalyzerOverlay(); void ReleaseImageAnalyzer(); bool IsSupportImageAnalyzerFeature(); + void MarkDirty(); RefPtr paintMethod_; std::optional canvasSize_;