From 0ab86ce143779b364db969325592df69c18331a6 Mon Sep 17 00:00:00 2001 From: ruinivist Date: Sat, 16 Aug 2025 20:55:50 +0000 Subject: [PATCH] fix deprecations --- example/lib/render_callbacks_example.dart | 2 +- lib/core/background.dart | 12 +++++++----- lib/core/render.dart | 24 +++++++++++------------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/example/lib/render_callbacks_example.dart b/example/lib/render_callbacks_example.dart index 5e174b3..872200f 100644 --- a/example/lib/render_callbacks_example.dart +++ b/example/lib/render_callbacks_example.dart @@ -92,7 +92,7 @@ class _RenderCallbacksExampleState extends State { width: 350, height: 400, decoration: BoxDecoration( - color: Colors.black.withOpacity(0.8), + color: Colors.black.withValues(alpha: 0.8), borderRadius: BorderRadius.circular(8), border: Border.all(color: Colors.grey), ), diff --git a/lib/core/background.dart b/lib/core/background.dart index 829608e..63bd207 100644 --- a/lib/core/background.dart +++ b/lib/core/background.dart @@ -64,7 +64,9 @@ class DotGridBackground extends CanvasBackground { _program = p; // Request a repaint when shader becomes available try { - RendererBinding.instance.renderView.markNeedsPaint(); + for (final renderView in RendererBinding.instance.renderViews) { + renderView.markNeedsPaint(); + } } catch (_) {} }).catchError((_) { // keep _program null; we'll fallback to CPU/simple paint @@ -124,10 +126,10 @@ class DotGridBackground extends CanvasBackground { } void set4c(Color c) { - shader.setFloat(i++, c.red / 255.0); - shader.setFloat(i++, c.green / 255.0); - shader.setFloat(i++, c.blue / 255.0); - shader.setFloat(i++, c.opacity); + shader.setFloat(i++, c.r); + shader.setFloat(i++, c.g); + shader.setFloat(i++, c.b); + shader.setFloat(i++, c.a); } set2(originXPx, originYPx); diff --git a/lib/core/render.dart b/lib/core/render.dart index e6d0aba..a4f030a 100644 --- a/lib/core/render.dart +++ b/lib/core/render.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:flutter/services.dart'; // added for LogicalKeyboardKey -import 'package:flutter/gestures.dart'; // added for PointerScrollEvent +import 'package:flutter/services.dart'; // HardwareKeyboard, LogicalKeyboardKey +import 'package:flutter/gestures.dart'; // PointerScrollEvent import '../utils/offset_extensions.dart'; import '../utils/styles.dart'; @@ -47,7 +47,7 @@ class _LazyCanvasState extends State with TickerProviderStateMixin childrenIds, + required List ssPositions, + required double scale, + required Offset gridSpaceOffset, + required CanvasBackground canvasBackground, required this.onCanvasSizeChange, required this.onChildSizeChange, }) : assert(childrenIds.length == ssPositions.length), @@ -282,8 +282,8 @@ class _CanvasRenderBox extends RenderBox // Apply transformation using pushTransform for proper coordinate handling final transform = Matrix4.identity() - ..translate(drawAt.dx, drawAt.dy) - ..scale(childParentData.scale, childParentData.scale); + ..translateByDouble(drawAt.dx, drawAt.dy, 0.0, 1.0) + ..scaleByDouble(childParentData.scale, childParentData.scale, 1.0, 1.0); // Note: initially I was using context.canvas.translate and context.canvas.scale // but that doesn't work with say using a SingleChildScrollView inside a child @@ -319,8 +319,8 @@ class _CanvasRenderBox extends RenderBox } else { // same paint transform for hit testing when scaled final Matrix4 transform = Matrix4.identity() - ..translate(childParentData.offset.dx, childParentData.offset.dy) - ..scale(childParentData.scale, childParentData.scale); + ..translateByDouble(childParentData.offset.dx, childParentData.offset.dy, 0.0, 1.0) + ..scaleByDouble(childParentData.scale, childParentData.scale, 1.0, 1.0); isHit = result.addWithPaintTransform( transform: transform,