tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-04-25 02:19:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): keep zoom consistent when scale boundaries change

Browse Source
This commit is contained in:
LeLunZ 2026-04-21 18:15:48 +02:00
parent 4bd3d6054e
commit fa11a9a01b
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
View File

@ -139,8 +139,6 @@ class PhotoViewCoreState extends State<PhotoViewCore>
PhotoViewHeroAttributes? get heroAttributes => widget.heroAttributes;
late ScaleBoundaries cachedScaleBoundaries = widget.scaleBoundaries;
void handleScaleAnimation() {
scale = _scaleAnimation!.value;
}
@ -303,7 +301,12 @@ class PhotoViewCoreState extends State<PhotoViewCore>
controller.scaleAnimationBuilder(_animateControllerScale);
controller.rotationAnimationBuilder(_animateControllerRotation);
cachedScaleBoundaries = widget.scaleBoundaries;
final prevBoundaries = controller.scaleBoundaries;
if (prevBoundaries != null && prevBoundaries != widget.scaleBoundaries) {
_updateScaleBoundaries(prevBoundaries);
} else {
controller.scaleBoundaries = widget.scaleBoundaries;
}
_scaleAnimationController = AnimationController(vsync: this)
..addListener(handleScaleAnimation)
@ -334,14 +337,26 @@ class PhotoViewCoreState extends State<PhotoViewCore>
widget.onTapDown?.call(context, details, controller.value);
}
void _updateScaleBoundaries(ScaleBoundaries prev) {
if (controller.scale != null && prev.initialScale > 0) {
final ratio = widget.scaleBoundaries.initialScale / prev.initialScale;
controller.setScaleInvisibly(controller.scale! * ratio);
} else {
markNeedsScaleRecalc = true;
}
controller.scaleBoundaries = widget.scaleBoundaries;
}
@override
void didUpdateWidget(PhotoViewCore oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.scaleBoundaries != oldWidget.scaleBoundaries) {
_updateScaleBoundaries(oldWidget.scaleBoundaries);
}
}
@override
Widget build(BuildContext context) {
// Check if we need a recalc on the scale
if (widget.scaleBoundaries != cachedScaleBoundaries) {
markNeedsScaleRecalc = true;
cachedScaleBoundaries = widget.scaleBoundaries;
}
return StreamBuilder(
stream: controller.outputStateStream,
initialData: controller.prevValue,

1
mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/widgets.dart';
import 'package:immich_mobile/utils/debug_print.dart';
import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
import 'package:immich_mobile/widgets/photo_view/src/core/photo_view_core.dart';
import 'package:immich_mobile/widgets/photo_view/src/photo_view_default_widgets.dart';