Save before clip (#232)

dnfield · Feb 6, 2024 · 5bc6a02 · 5bc6a02
1 parent d67db22
commit 5bc6a02
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 10 deletions.
diff --git a/packages/vector_graphics/CHANGELOG.md b/packages/vector_graphics/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.10+1
+
+- Add missing save before clip.
+
 ## 1.1.10
 
 - Add missing clip before saveLayer.

diff --git a/packages/vector_graphics/lib/src/render_vector_graphic.dart b/packages/vector_graphics/lib/src/render_vector_graphic.dart
@@ -439,6 +439,7 @@ class RenderPictureVectorGraphic extends RenderBox {
       context.canvas.translate(offset.dx, offset.dy);
     }
     if (_opacityValue != 1.0 || colorFilter != null) {
+      context.canvas.save();
       context.canvas.clipRect(Offset.zero & size);
       context.canvas.saveLayer(Offset.zero & size, colorPaint);
     }

diff --git a/packages/vector_graphics/pubspec.yaml b/packages/vector_graphics/pubspec.yaml
@@ -1,6 +1,6 @@
 name: vector_graphics
 description: A vector graphics rendering package for Flutter.
-version: 1.1.10
+version: 1.1.10+1
 homepage: https://github.com/dnfield/vector_graphics
 
 environment:
@@ -10,13 +10,13 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  vector_graphics_codec: 1.1.10
+  vector_graphics_codec: 1.1.10+1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^1.0.0
-  vector_graphics_compiler: 1.1.10
+  vector_graphics_compiler: 1.1.10+1
 
 # Comment out before publishing
 dependency_overrides:

diff --git a/packages/vector_graphics/test/render_vector_graphics_test.dart b/packages/vector_graphics/test/render_vector_graphics_test.dart
@@ -421,6 +421,9 @@ void main() {
 
     expect(context.canvas.lastClipRect,
         equals(const ui.Rect.fromLTRB(0, 0, 50, 50)));
+    expect(context.canvas.saveCount, 0);
+    expect(context.canvas.totalSaves, 1);
+    expect(context.canvas.totalSaveLayers, 1);
   });
 }
 
@@ -430,6 +433,9 @@ class FakeCanvas extends Fake implements Canvas {
   Rect? lastDst;
   Paint? lastPaint;
   Rect? lastClipRect;
+  int saveCount = 0;
+  int totalSaves = 0;
+  int totalSaveLayers = 0;
 
   @override
   void drawImageRect(ui.Image image, Rect src, Rect dst, Paint paint) {
@@ -444,14 +450,30 @@ class FakeCanvas extends Fake implements Canvas {
 
   @override
   int getSaveCount() {
-    return 0;
+    return saveCount;
   }
 
   @override
-  void restoreToCount(int count) {}
+  void restoreToCount(int count) {
+    saveCount = count;
+  }
+
+  @override
+  void saveLayer(Rect? bounds, Paint paint) {
+    saveCount++;
+    totalSaveLayers++;
+  }
 
   @override
-  void saveLayer(Rect? bounds, Paint paint) {}
+  void save() {
+    saveCount++;
+    totalSaves++;
+  }
+
+  @override
+  void restore() {
+    saveCount--;
+  }
 
   @override
   void clipRect(ui.Rect rect,

diff --git a/packages/vector_graphics_codec/CHANGELOG.md b/packages/vector_graphics_codec/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.10+1
+
+- Add missing save before clip.
+
 ## 1.1.10
 
 - Add missing clip before saveLayer.

diff --git a/packages/vector_graphics_codec/pubspec.yaml b/packages/vector_graphics_codec/pubspec.yaml
@@ -1,6 +1,6 @@
 name: vector_graphics_codec
 description: An encoding library for `package:vector_graphics`
-version: 1.1.10
+version: 1.1.10+1
 homepage: https://github.com/dnfield/vector_graphics
 
 environment:

diff --git a/packages/vector_graphics_compiler/CHANGELOG.md b/packages/vector_graphics_compiler/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.10+1
+
+- Add missing save before clip.
+
 ## 1.1.10
 
 - Add missing clip before saveLayer.

diff --git a/packages/vector_graphics_compiler/pubspec.yaml b/packages/vector_graphics_compiler/pubspec.yaml
@@ -1,6 +1,6 @@
 name: vector_graphics_compiler
 description: A compiler for `package:vector_graphics`.
-version: 1.1.10
+version: 1.1.10+1
 homepage: https://github.com/dnfield/vector_graphics
 
 executables:
@@ -14,7 +14,7 @@ dependencies:
   meta: ^1.7.0
   path_parsing: ^1.0.1
   xml: ^6.3.0
-  vector_graphics_codec: 1.1.10
+  vector_graphics_codec: 1.1.10+1
   path: ^1.8.0
 
 dev_dependencies:
@@ -25,7 +25,7 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  vector_graphics: 1.1.10
+  vector_graphics: 1.1.10+1
 
 # Comment out before publishing
 dependency_overrides: