Fix baking not working correctly when zooming in

LinwoodDev · Dec 17, 2024 · e8c44f5 · e8c44f5
1 parent 1639801
commit e8c44f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/app/lib/cubits/current_index.dart b/app/lib/cubits/current_index.dart
@@ -523,14 +523,15 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
     if (viewportSize != null) {
       size *= resolution.multiplier;
     }
-    final renderTransform =
-        transform.improve(resolution, size / resolution.multiplier);
+    final imageWidth = (size.width * ratio).ceil();
+    final imageHeight = (size.height * ratio).ceil();
+    rect = resolution.getRect(rect);
+    final renderTransform = transform.improve(resolution, rect.size);
     final viewChanged = cameraViewport.width != size.width.ceil() ||
         cameraViewport.height != size.height.ceil() ||
         cameraViewport.x != renderTransform.position.dx ||
         cameraViewport.y != renderTransform.position.dy ||
         cameraViewport.scale != transform.size;
-    rect = resolution.getRect(rect);
     reset = reset || viewChanged;
     resetAllLayers = resetAllLayers || viewChanged;
     if (renderers.isEmpty && !reset) return;
@@ -571,9 +572,6 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
 
     var picture = recorder.endRecording();
 
-    final imageWidth = (size.width * ratio).ceil();
-    final imageHeight = (size.height * ratio).ceil();
-
     final newImage = await picture.toImage(imageWidth, imageHeight);
 
     var currentRenderers = state.cameraViewport.unbakedElements;

diff --git a/app/lib/models/viewport.dart b/app/lib/models/viewport.dart
@@ -1,7 +1,6 @@
 import 'dart:math';
 import 'dart:ui' as ui;
 
-import 'package:butterfly/cubits/settings.dart';
 import 'package:butterfly/renderers/renderer.dart';
 import 'package:butterfly_api/butterfly_api.dart';
 import 'package:equatable/equatable.dart';
@@ -63,9 +62,6 @@ class CameraViewport extends Equatable {
 
   ui.Rect toRect() => toOffset() & toSize(true);
 
-  ui.Rect toViewportRect(RenderResolution resolution) =>
-      resolution.getRect(toOffset() & toSize(true));
-
   Area toArea() => Area(
         name: '',
         position: toPoint(),

diff --git a/metadata/en-US/changelogs/125.txt b/metadata/en-US/changelogs/125.txt
@@ -1 +1,2 @@
-* Improve mobile color picker
+* Improve mobile color picker
+* Fix baking not working correctly when zooming in