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.

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

Fix : HitTest Area fix for Plain Needle #270

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions lib/src/radial_gauge/pointer/needle_pointer_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class RenderNeedlePointer extends RenderBox {
@override
bool hitTestSelf(Offset position) {
Offset calulatedPosition = localToGlobal(position);

if (needlePointerRect.contains(calulatedPosition)) {
return true;
} else if (needlePointerRect.contains(position)) {
Expand All @@ -156,7 +157,6 @@ class RenderNeedlePointer extends RenderBox {

@override
void performLayout() {
// size = Size(_needleWidth + _tailRadius, _needleHeight);
size = Size(constraints.maxWidth, constraints.maxHeight);
}

Expand Down Expand Up @@ -227,8 +227,25 @@ class RenderNeedlePointer extends RenderBox {

needlePath.close();

needlePointerRect = needlePath;
// canvas.drawPath(needlePath, Paint()..color = Colors.green);
final hitTestWidth = _needleWidth;

final dx = needleEndX - needleStartX;
final dy = needleEndY - needleStartY;

final norm = sqrt(dx * dx + dy * dy);
final perpX = -dy / norm * hitTestWidth / 2;
final perpY = dx / norm * hitTestWidth / 2;

final hitTestPath = Path()
..moveTo(needleStartX + perpX, needleStartY + perpY)
..lineTo(needleEndX + perpX, needleEndY + perpY)
..lineTo(needleEndX - perpX, needleEndY - perpY)
..lineTo(needleStartX - perpX, needleStartY - perpY)
..close();

needlePointerRect =
_needleStyle == NeedleStyle.gaugeNeedle ? needlePath : hitTestPath;

// Needle Pointer paint
if (getNeedleStyle == NeedleStyle.gaugeNeedle) {
canvas.drawPath(needlePath, needlePaint);
Expand All @@ -247,26 +264,3 @@ class RenderNeedlePointer extends RenderBox {
return newValue;
}
}

// @override
// void applyPaintTransform(RenderBox child, Matrix4 transform) {
// if (child is RenderNeedlePointer) {
// final centerX = size.width / 2;
// final centerY = size.height / 2;

// transform.translate(centerX, centerY);
// double value = calculateValueAngle(
// child.getValue, getRadialGauge.track.start, getRadialGauge.track.end);
// double startAngle = (getRadialGauge.track.startAngle - 180) * (pi / 180);
// double endAngle = (getRadialGauge.track.endAngle - 180) * (pi / 180);
// double angle = startAngle + (value / 100) * (endAngle - startAngle);
// double toRotateAngle = angle - (pi / 2);
// transform.rotateZ(toRotateAngle); // Specify the rotation in radians
// transform.translate(
// -centerX - child.getNeedleWidth / 2 - child.getTailRadius / 2,
// -centerY - child.getNeedleHeight + child.getTailRadius / 2);

// super.applyPaintTransform(child, transform);
// markNeedsLayout();
// }
// }
26 changes: 17 additions & 9 deletions lib/src/radial_gauge/pointer/radial_widget_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,33 @@ class RenderRadialWidgetPointer extends RenderProxyBox {
void paint(PaintingContext context, Offset offset) {
double gaugeStart = _radialGauge.track.start;
double gaugeEnd = _radialGauge.track.end;
double containerWidth = constraints.maxWidth;
double containerHeight = constraints.maxHeight;
double containerShortestSide = min(containerWidth, containerHeight);

final childSize = child?.computeDryLayout(constraints);
final childOffsetX = (childSize?.width ?? 0.0) / 2;
final childOffsetY = (childSize?.height ?? 0.0) / 2;

// final center = Offset(offset.dx, offset.dy);
final center = Offset(
1440 * _radialGauge.xCenterCoordinate -
2 * _radialGauge.track.thickness,
900 * _radialGauge.yCenterCoordinate - _radialGauge.track.thickness);
containerWidth * _radialGauge.xCenterCoordinate + offset.dx,
containerHeight * _radialGauge.yCenterCoordinate + offset.dy);

double value = calculateValueAngle(_value, gaugeStart, gaugeEnd);
double startAngle = (_radialGauge.track.startAngle - 180) * (pi / 180);
double endAngle = (_radialGauge.track.endAngle - 180) * (pi / 180);

final double angle = startAngle + (value / 100) * (endAngle - startAngle);

double circlePointerOffset =
(900 / 2 - _radialGauge.track.thickness) * _radialGauge.radiusFactor;
(containerShortestSide / 2 - _radialGauge.track.thickness) *
_radialGauge.radiusFactor;

double circlePointerEndX =
center.dx + circlePointerOffset * cos(angle) - childOffsetX;
double circlePointerEndY =
center.dy + circlePointerOffset * sin(angle) - childOffsetY;

double circlePointerEndX = center.dx + circlePointerOffset * cos(angle);
double circlePointerEndY = center.dy + circlePointerOffset * sin(angle);
// canvas.drawCircle(Offset(circlePointerEndX, circlePointerEndY), 30,
// Paint()..color = Colors.red);
super.paint(context, Offset(circlePointerEndX, circlePointerEndY));
}

Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: geekyants_flutter_gauges
description: A linear gauge package for Flutter that displays progress
and can be customized for appearance and behavior.
version: 1.0.3
version: 1.0.4
homepage: https://github.com/GeekyAnts/GaugesFlutter

environment:
Expand Down
Loading