Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: natural switch thumb grab #779

Merged
merged 1 commit into from
Sep 20, 2023
Merged

fix: natural switch thumb grab #779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 16 additions & 24 deletions lib/src/widgets/yaru_switch.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class _YaruSwitchState extends YaruTogglableState<YaruSwitch> {
Size get togglableSize => _kSwitchSize;

bool isDragging = false;
double gestureDeltaDx = 0.0;

@override
void handleTap([Intent? _]) {
Expand Down Expand Up @@ -244,37 +245,27 @@ class _YaruSwitchState extends YaruTogglableState<YaruSwitch> {
return child;
}

final thumbSize = _kSwitchSize.height * _kSwitchThumbSizeFactor;
final thumbGap = (_kSwitchSize.height - thumbSize) / 2;
final innerWidth = _kSwitchSize.width - thumbGap * 2;

return GestureDetector(
onPanStart: (details) {
final thumbSize = _kSwitchSize.height * _kSwitchThumbSizeFactor;
final thumbGap = (_kSwitchSize.height - thumbSize) / 2;

final minDragX = widget.value
? _kSwitchSize.width - (thumbGap + thumbSize)
: thumbGap;
final maxDragX =
widget.value ? _kSwitchSize.width - thumbGap : thumbGap + thumbSize;

if (details.localPosition.dx >= minDragX &&
details.localPosition.dx <= maxDragX) {
setState(() {
isDragging = true;
handleActiveChange(true);
});
}
setState(() {
gestureDeltaDx = positionController.value * (innerWidth - thumbSize);
isDragging = true;
handleActiveChange(true);
handleHoverChange(true);
});
},
onPanUpdate: (details) {
if (!isDragging) {
return;
}

final thumbSize = _kSwitchSize.height * _kSwitchThumbSizeFactor;
final thumbGap = (_kSwitchSize.height - thumbSize) / 2;
final dragGap = thumbGap + thumbSize / 2;
final innerWidth = _kSwitchSize.width - dragGap * 2;

positionController.value =
(details.localPosition.dx - dragGap) / innerWidth;
gestureDeltaDx += details.delta.dx;
positionController.value = gestureDeltaDx / (innerWidth - thumbSize);
handleActiveChange(true);
handleHoverChange(true);
},
onPanEnd: (details) {
if (!isDragging) {
Expand All @@ -284,6 +275,7 @@ class _YaruSwitchState extends YaruTogglableState<YaruSwitch> {
setState(() {
isDragging = false;
handleActiveChange(false);
handleHoverChange(false);

if (positionController.value < .5) {
if (widget.value != false) {
Expand Down