High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): image jumps when full-res image loads during pinch or zoom animation (#31948)
Luis Nachtigall007c18aec6cc
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dartindex 316d7c515e..486c790d9f 100644--- a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart@@ -130,6 +130,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>double? _rotationBefore;late final AnimationController _scaleAnimationController;+ Tween<double>? _scaleTween;Animation<double>? _scaleAnimation;late final AnimationController _positionAnimationController;@@ -241,7 +242,8 @@ class PhotoViewCoreState extends State<PhotoViewCore>if (!mounted) {return Future.value();}- _scaleAnimation = Tween<double>(begin: from, end: to).animate(_scaleAnimationController);+ _scaleTween = Tween<double>(begin: from, end: to);+ _scaleAnimation = _scaleTween!.animate(_scaleAnimationController);_scaleAnimationController.value = 0.0;return _scaleAnimationController.fling(velocity: 0.4);}@@ -301,7 +303,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>controller.scaleAnimationBuilder(_animateControllerScale);controller.rotationAnimationBuilder(_animateControllerRotation);- _updateScaleBoundaries();+ _syncScaleBoundaries();_scaleAnimationController = AnimationController(vsync: this)..addListener(handleScaleAnimation)@@ -324,7 +326,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>super.dispose();}- void _updateScaleBoundaries() {+ void _syncScaleBoundaries() {final prev = controller.scaleBoundaries;if (prev == widget.scaleBoundaries) {return;@@ -333,6 +335,16 @@ class PhotoViewCoreState extends State<PhotoViewCore>if (prev != null && controller.scale != null && prev.initialScale > 0) {final ratio = widget.scaleBoundaries.initialScale / prev.initialScale;controller.setScaleInvisibly(controller.scale! * ratio);++ if (_scaleBefore != null) {+ _scaleBefore = _scaleBefore! * ratio;+ }++ final tween = _scaleTween;+ if (tween != null && _scaleAnimationController.isAnimating) {+ tween.begin = tween.begin! * ratio;+ tween.end = tween.end! * ratio;+ }} else {markNeedsScaleRecalc = true;}@@ -342,7 +354,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>@overridevoid didUpdateWidget(PhotoViewCore oldWidget) {super.didUpdateWidget(oldWidget);- _updateScaleBoundaries();+ _syncScaleBoundaries();}@override