mirror of
https://gitlab.com/nkming2/nc-photos.git
synced 2025-02-24 10:28:50 +01:00
Fix gesture conflict in collection browser
This commit is contained in:
parent
14da434706
commit
57278c0c0d
1 changed files with 19 additions and 0 deletions
|
@ -240,6 +240,21 @@ class _WrappedCollectionBrowserState extends State<_WrappedCollectionBrowser>
|
||||||
children: [
|
children: [
|
||||||
Listener(
|
Listener(
|
||||||
onPointerMove: (event) => _onPointerMove(context, event),
|
onPointerMove: (event) => _onPointerMove(context, event),
|
||||||
|
onPointerDown: (_) {
|
||||||
|
setState(() {
|
||||||
|
++_finger;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onPointerUp: (_) {
|
||||||
|
setState(() {
|
||||||
|
--_finger;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onPointerCancel: (_) {
|
||||||
|
setState(() {
|
||||||
|
--_finger;
|
||||||
|
});
|
||||||
|
},
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onScaleStart: (_) {
|
onScaleStart: (_) {
|
||||||
_bloc.add(const _StartScaling());
|
_bloc.add(const _StartScaling());
|
||||||
|
@ -252,6 +267,9 @@ class _WrappedCollectionBrowserState extends State<_WrappedCollectionBrowser>
|
||||||
},
|
},
|
||||||
child: CustomScrollView(
|
child: CustomScrollView(
|
||||||
controller: _scrollController,
|
controller: _scrollController,
|
||||||
|
physics: _finger >= 2
|
||||||
|
? const NeverScrollableScrollPhysics()
|
||||||
|
: null,
|
||||||
slivers: [
|
slivers: [
|
||||||
_BlocBuilder(
|
_BlocBuilder(
|
||||||
buildWhen: (previous, current) =>
|
buildWhen: (previous, current) =>
|
||||||
|
@ -410,6 +428,7 @@ class _WrappedCollectionBrowserState extends State<_WrappedCollectionBrowser>
|
||||||
late final _bloc = context.read<_Bloc>();
|
late final _bloc = context.read<_Bloc>();
|
||||||
final _scrollController = ScrollController();
|
final _scrollController = ScrollController();
|
||||||
bool? _isDragScrollingDown;
|
bool? _isDragScrollingDown;
|
||||||
|
int _finger = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
class _ContentList extends StatelessWidget {
|
class _ContentList extends StatelessWidget {
|
||||||
|
|
Loading…
Reference in a new issue