Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improved scroll accuracy after scaling

Browse source
This commit is contained in:
Thibault Deckers 2020-05-04 13:02:53 +09:00
parent 2740bdc597
commit bf90ad0b6a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/widgets/album/grid/scaling.dart
View file

@ -13,6 +13,7 @@ import 'package:provider/provider.dart';
class GridScaleGestureDetector extends StatefulWidget {
final GlobalKey scrollableKey;
final ValueNotifier<double> appBarHeightNotifier;
final ValueNotifier<double> extentNotifier;
final Size mqSize;
final double mqHorizontalPadding;
@ -20,6 +21,7 @@ class GridScaleGestureDetector extends StatefulWidget {
const GridScaleGestureDetector({
this.scrollableKey,
@required this.appBarHeightNotifier,
@required this.extentNotifier,
@required this.mqSize,
@required this.mqHorizontalPadding,
@ -120,8 +122,11 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
final scrollableContext = widget.scrollableKey.currentContext;
final gridSize = (scrollableContext.findRenderObject() as RenderBox).size;
final sectionLayout = Provider.of<SectionedListLayout>(context, listen: false);
final tileRect = sectionLayout.getTileRect(_metadata.entry);
final scrollOffset = (tileRect?.top ?? 0) - gridSize.height / 2;
final tileRect = sectionLayout.getTileRect(_metadata.entry) ?? Rect.zero;
// most of the time the app bar will be scrolled away after scaling,
// so we compensate for it to center the focal point thumbnail
final appBarHeight = widget.appBarHeightNotifier.value;
final scrollOffset = tileRect.top + (tileRect.height - gridSize.height) / 2 + appBarHeight;
viewportClosure.offset.jumpTo(max(.0, scrollOffset));
_applyingScale = false;
});

1
lib/widgets/album/thumbnail_collection.dart
View file

@ -38,6 +38,7 @@ class ThumbnailCollection extends StatelessWidget {
final draggable = _buildDraggableScrollView(scrollView);
final scaler = GridScaleGestureDetector(
scrollableKey: _scrollableKey,
appBarHeightNotifier: _appBarHeightNotifier,
extentNotifier: _tileExtentNotifier,
mqSize: mqSize,
mqHorizontalPadding: mqHorizontalPadding,