From 31a933809ac7ff1e9008c115f1006d318f4e8a58 Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 2 May 2024 10:31:45 +0800 Subject: [PATCH 01/11] fix: change fast marker --- src/components/FastMarker.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/FastMarker.tsx b/src/components/FastMarker.tsx index c388848b0..561d9ae0e 100644 --- a/src/components/FastMarker.tsx +++ b/src/components/FastMarker.tsx @@ -156,8 +156,7 @@ const FastMarker = (props: TFastMarkerProps) => { const { overlap_y_axis = true } = props; - const maxWidth = chartNode && !overlap_y_axis ? chartNode.offsetWidth - yAxisWidth - 10 : '100%'; - + const maxWidth = chartNode && !overlap_y_axis ? chartNode.offsetWidth - yAxisWidth - 79 : 'calc(100% - 70px)'; return (
From be7302b4a281358eb7f8e46a468000db9ab7b46f Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 2 May 2024 11:22:56 +0800 Subject: [PATCH 02/11] trigger From 3cdbaa1838fb201e3baed2af32523394d8a4cf5a Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 2 May 2024 14:13:29 +0800 Subject: [PATCH 03/11] trigger From 8cb1d3dd6cd1fd2e704d5b8d102acc656e01f60c Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 2 May 2024 16:05:38 +0800 Subject: [PATCH 04/11] trigger From 651fc43b14b4f0f6d2bc572b568cdae6b97fe755 Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 2 May 2024 17:15:15 +0800 Subject: [PATCH 05/11] barrier YAxis clipping --- .../accumulator_marker_icon_painter.dart | 144 ++++++++--------- .../digit_marker_icon_painter.dart | 6 +- .../tick_marker_icon_painter.dart | 149 +++++++++--------- .../lib/src/painters/blink_tick_painter.dart | 23 +-- 4 files changed, 167 insertions(+), 155 deletions(-) diff --git a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart index 4c3ba8ad3..7f0c5a978 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart @@ -137,90 +137,92 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { fontSize: painterProps.isMobile ? 10 : 14, ); - if (previousTickMarker != null && previousTickMarker.color != null) { - _drawPreviousTickBarrier( - canvas, - startLeft, - endLeft, - middleTop, - previousTickMarker.color!, - barrierColor, - ); - } + yAxisClipping(canvas, size, () { + if (previousTickMarker != null && previousTickMarker.color != null) { + _drawPreviousTickBarrier( + canvas, + startLeft, + endLeft, + middleTop, + previousTickMarker.color!, + barrierColor, + ); + } - if (isTopVisible || hasPersistentBorders) { - final Path path = Path() - ..moveTo(startLeft + 2.5, displayedTop) - ..lineTo(startLeft - 2.5, displayedTop) - ..lineTo(startLeft, displayedTop + 4.5) - ..lineTo(startLeft + 2.5, displayedTop) - ..close(); - - canvas.drawPath(path, paint); - - paintHorizontalDashedLine( - canvas, - startLeft - 2.5, - endLeft, - displayedTop, - barrierColor, - 1.5, - dashSpace: 0, - ); + if (isTopVisible || hasPersistentBorders) { + final Path path = Path() + ..moveTo(startLeft + 2.5, displayedTop) + ..lineTo(startLeft - 2.5, displayedTop) + ..lineTo(startLeft, displayedTop + 4.5) + ..lineTo(startLeft + 2.5, displayedTop) + ..close(); - // draw difference between high barrier and previous spot price - if (highMarker.text != null) { - final TextPainter textPainter = - makeTextPainter(highMarker.text!, textStyle); + canvas.drawPath(path, paint); - paintWithTextPainter( + paintHorizontalDashedLine( canvas, - painter: textPainter, - anchor: Offset(endLeft - 1, displayedTop - 10), - anchorAlignment: Alignment.centerRight, + startLeft - 2.5, + endLeft, + displayedTop, + barrierColor, + 1.5, + dashSpace: 0, ); + + // draw difference between high barrier and previous spot price + if (highMarker.text != null) { + final TextPainter textPainter = + makeTextPainter(highMarker.text!, textStyle); + + paintWithTextPainter( + canvas, + painter: textPainter, + anchor: Offset(endLeft - 1, displayedTop - 10), + anchorAlignment: Alignment.centerRight, + ); + } } - } - if (isBottomVisible || hasPersistentBorders) { - final Path path = Path() - ..moveTo(startLeft + 2.5, displayedBottom) - ..lineTo(startLeft - 2.5, displayedBottom) - ..lineTo(startLeft, displayedBottom - 4.5) - ..lineTo(startLeft + 2.5, displayedBottom) - ..close(); - - canvas.drawPath(path, paint); - - paintHorizontalDashedLine( - canvas, - startLeft - 2.5, - endLeft, - displayedBottom, - barrierColor, - 1.5, - dashSpace: 0, - ); + if (isBottomVisible || hasPersistentBorders) { + final Path path = Path() + ..moveTo(startLeft + 2.5, displayedBottom) + ..lineTo(startLeft - 2.5, displayedBottom) + ..lineTo(startLeft, displayedBottom - 4.5) + ..lineTo(startLeft + 2.5, displayedBottom) + ..close(); - // draw difference between low barrier and previous spot price - if (lowMarker.text != null) { - final TextPainter textPainter = - makeTextPainter(lowMarker.text!, textStyle); + canvas.drawPath(path, paint); - paintWithTextPainter( + paintHorizontalDashedLine( canvas, - painter: textPainter, - anchor: Offset(endLeft - 1, displayedBottom + 12), - anchorAlignment: Alignment.centerRight, + startLeft - 2.5, + endLeft, + displayedBottom, + barrierColor, + 1.5, + dashSpace: 0, ); + + // draw difference between low barrier and previous spot price + if (lowMarker.text != null) { + final TextPainter textPainter = + makeTextPainter(lowMarker.text!, textStyle); + + paintWithTextPainter( + canvas, + painter: textPainter, + anchor: Offset(endLeft - 1, displayedBottom + 12), + anchorAlignment: Alignment.centerRight, + ); + } } - } - final Paint rectPaint = Paint()..color = shadeColor; + final Paint rectPaint = Paint()..color = shadeColor; - canvas.drawRect( - Rect.fromLTRB(startLeft, displayedTop, endLeft, displayedBottom), - rectPaint, - ); + canvas.drawRect( + Rect.fromLTRB(startLeft, displayedTop, endLeft, displayedBottom), + rectPaint, + ); + }); } void _drawPreviousTickBarrier( diff --git a/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart index 6aee50903..520c53786 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart @@ -52,8 +52,10 @@ class DigitMarkerIconPainter extends MarkerGroupIconPainter { for (final WebMarker marker in markerGroup.markers) { final Offset center = points[marker.markerType!]!; - _drawMarker(canvas, size, theme, marker, center, markerGroup.style, - painterProps.zoom, opacity); + yAxisClipping(canvas, size, () { + _drawMarker(canvas, size, theme, marker, center, markerGroup.style, + painterProps.zoom, opacity); + }); } } diff --git a/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart index f2e278c4a..8fbbf7573 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart @@ -76,49 +76,52 @@ class TickMarkerIconPainter extends MarkerGroupIconPainter { final Offset? _endOffset = points[MarkerType.end]; final Offset? _exitOffset = points[MarkerType.exit]; - if (_entryOffset != null && _startOffset != null) { - paintHorizontalDashedLine( - canvas, - _startOffset.dx, - _entryOffset.dx, - _startOffset.dy, - color, - 1, - dashWidth: 1, - dashSpace: 1, - ); - } + yAxisClipping(canvas, size, () { + if (_entryOffset != null && _startOffset != null) { + paintHorizontalDashedLine( + canvas, + _startOffset.dx, + _entryOffset.dx, + _startOffset.dy, + color, + 1, + dashWidth: 1, + dashSpace: 1, + ); + } - if (_entryOffset != null && (_latestOffset != null || _endOffset != null)) { - final double dx = (_latestOffset?.dx ?? _endOffset?.dx)!; - final double dy = (_latestOffset?.dy ?? _endOffset?.dy)!; + if (_entryOffset != null && + (_latestOffset != null || _endOffset != null)) { + final double dx = (_latestOffset?.dx ?? _endOffset?.dx)!; + final double dy = (_latestOffset?.dy ?? _endOffset?.dy)!; - canvas.drawLine(_entryOffset, Offset(dx, dy), paint); - } + canvas.drawLine(_entryOffset, Offset(dx, dy), paint); + } - if (_entryOffset != null && _entryTickOffset != null) { - paintVerticalLine( - canvas, - _entryOffset, - _entryTickOffset, - color, - 1, - dashWidth: 2, - dashSpace: 2, - ); - } + if (_entryOffset != null && _entryTickOffset != null) { + paintVerticalLine( + canvas, + _entryOffset, + _entryTickOffset, + color, + 1, + dashWidth: 2, + dashSpace: 2, + ); + } - if (_exitOffset != null && _endOffset != null) { - paintVerticalLine( - canvas, - _exitOffset, - _endOffset, - color, - 1, - dashWidth: 2, - dashSpace: 2, - ); - } + if (_exitOffset != null && _endOffset != null) { + paintVerticalLine( + canvas, + _exitOffset, + _endOffset, + color, + 1, + dashWidth: 2, + dashSpace: 2, + ); + } + }); } void _drawMarker(Canvas canvas, Size size, ChartTheme theme, WebMarker marker, @@ -127,39 +130,41 @@ class TickMarkerIconPainter extends MarkerGroupIconPainter { final Paint paint = Paint()..color = color; - switch (marker.markerType) { - case MarkerType.activeStart: - paintStartLine(canvas, size, marker, anchor, style, zoom); - break; - case MarkerType.start: - _drawStartPoint( - canvas, size, theme, marker, anchor, style, zoom, opacity); - break; - case MarkerType.entry: - case MarkerType.entryTick: - _drawEntryPoint(canvas, theme, anchor, color, zoom, opacity); - break; - case MarkerType.end: - paintEndMarker(canvas, theme, anchor - Offset(1, 20 * zoom), - style.backgroundColor, zoom); - break; - case MarkerType.exit: - canvas.drawCircle( - anchor, - 3 * zoom, - paint, - ); - break; - case MarkerType.tick: - final Paint paint = Paint()..color = theme.base01Color; - _drawTickPoint(canvas, anchor, paint, zoom); - break; - case MarkerType.latestTick: - _drawTickPoint(canvas, anchor, paint, zoom); - break; - default: - break; - } + yAxisClipping(canvas, size, () { + switch (marker.markerType) { + case MarkerType.activeStart: + paintStartLine(canvas, size, marker, anchor, style, zoom); + break; + case MarkerType.start: + _drawStartPoint( + canvas, size, theme, marker, anchor, style, zoom, opacity); + break; + case MarkerType.entry: + case MarkerType.entryTick: + _drawEntryPoint(canvas, theme, anchor, color, zoom, opacity); + break; + case MarkerType.end: + paintEndMarker(canvas, theme, anchor - Offset(1, 20 * zoom), + style.backgroundColor, zoom); + break; + case MarkerType.exit: + canvas.drawCircle( + anchor, + 3 * zoom, + paint, + ); + break; + case MarkerType.tick: + final Paint paint = Paint()..color = theme.base01Color; + _drawTickPoint(canvas, anchor, paint, zoom); + break; + case MarkerType.latestTick: + _drawTickPoint(canvas, anchor, paint, zoom); + break; + default: + break; + } + }); } void _drawTickPoint(Canvas canvas, Offset anchor, Paint paint, double zoom) { diff --git a/chart_app/lib/src/painters/blink_tick_painter.dart b/chart_app/lib/src/painters/blink_tick_painter.dart index be39cc117..4465015b0 100644 --- a/chart_app/lib/src/painters/blink_tick_painter.dart +++ b/chart_app/lib/src/painters/blink_tick_painter.dart @@ -54,18 +54,21 @@ class BlinkingTickPainter if (animationInfo.currentTickPercent > 0 && animationInfo.currentTickPercent < 1) { + yAxisClipping(canvas, size, () { + canvas.drawCircle( + Offset(dotX!, y), + 3 + (animationInfo.currentTickPercent * 6), + Paint()..color = _paint.color.withOpacity(0.15), + ); + }); + } + yAxisClipping(canvas, size, () { canvas.drawCircle( - Offset(dotX, y), - 3 + (animationInfo.currentTickPercent * 6), - Paint()..color = _paint.color.withOpacity(0.15), + Offset(dotX!, y), + 3, + _paint, ); - } - - canvas.drawCircle( - Offset(dotX, y), - 3, - _paint, - ); + }); } } } From dab2e73e957331a2ff89917f8848affe680b6f0b Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Fri, 3 May 2024 16:12:07 +0800 Subject: [PATCH 06/11] yaxis config class --- .../marker_icon_painters/accumulator_marker_icon_painter.dart | 2 +- .../marker_icon_painters/digit_marker_icon_painter.dart | 2 +- .../marker_icon_painters/tick_marker_icon_painter.dart | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart index 7f0c5a978..a7b9fc761 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart @@ -137,7 +137,7 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { fontSize: painterProps.isMobile ? 10 : 14, ); - yAxisClipping(canvas, size, () { + YAxisConfig.instance.yAxisClipping(canvas, size, () { if (previousTickMarker != null && previousTickMarker.color != null) { _drawPreviousTickBarrier( canvas, diff --git a/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart index 520c53786..9c941260b 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/digit_marker_icon_painter.dart @@ -52,7 +52,7 @@ class DigitMarkerIconPainter extends MarkerGroupIconPainter { for (final WebMarker marker in markerGroup.markers) { final Offset center = points[marker.markerType!]!; - yAxisClipping(canvas, size, () { + YAxisConfig.instance.yAxisClipping(canvas, size, () { _drawMarker(canvas, size, theme, marker, center, markerGroup.style, painterProps.zoom, opacity); }); diff --git a/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart index 8fbbf7573..b055c84b4 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/tick_marker_icon_painter.dart @@ -76,7 +76,7 @@ class TickMarkerIconPainter extends MarkerGroupIconPainter { final Offset? _endOffset = points[MarkerType.end]; final Offset? _exitOffset = points[MarkerType.exit]; - yAxisClipping(canvas, size, () { + YAxisConfig.instance.yAxisClipping(canvas, size, () { if (_entryOffset != null && _startOffset != null) { paintHorizontalDashedLine( canvas, @@ -130,7 +130,7 @@ class TickMarkerIconPainter extends MarkerGroupIconPainter { final Paint paint = Paint()..color = color; - yAxisClipping(canvas, size, () { + YAxisConfig.instance.yAxisClipping(canvas, size, () { switch (marker.markerType) { case MarkerType.activeStart: paintStartLine(canvas, size, marker, anchor, style, zoom); From a54bd2f709a1cd3a6ee7f478a4ff461b3d6bcf4e Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Mon, 13 May 2024 11:23:29 +0800 Subject: [PATCH 07/11] trigger From ec606ef2c7881619da8a8518bf91820398e8ee67 Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Mon, 13 May 2024 12:53:21 +0800 Subject: [PATCH 08/11] fix for accumulator --- .../accumulator_marker_icon_painter.dart | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart index a7b9fc761..d3a9d83c8 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart @@ -140,6 +140,7 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { YAxisConfig.instance.yAxisClipping(canvas, size, () { if (previousTickMarker != null && previousTickMarker.color != null) { _drawPreviousTickBarrier( + size, canvas, startLeft, endLeft, @@ -226,6 +227,7 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { } void _drawPreviousTickBarrier( + Size size, Canvas canvas, double startX, double endX, @@ -233,21 +235,23 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { Color circleColor, Color barrierColor, ) { - canvas.drawCircle( - Offset(startX, y), - 1.5, - Paint()..color = circleColor, - ); + YAxisConfig.instance.yAxisClipping(canvas, size, () { + canvas.drawCircle( + Offset(startX, y), + 1.5, + Paint()..color = circleColor, + ); - paintHorizontalDashedLine( - canvas, - startX, - endX, - y, - barrierColor, - 1.5, - dashWidth: 2, - dashSpace: 4, - ); + paintHorizontalDashedLine( + canvas, + startX, + endX, + y, + barrierColor, + 1.5, + dashWidth: 2, + dashSpace: 4, + ); + }); } } From 13518d7324ccb9a2d45acb9ce67b7d959dad9e7f Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Mon, 13 May 2024 13:27:27 +0800 Subject: [PATCH 09/11] fix for accumulator spacing --- .../marker_icon_painters/accumulator_marker_icon_painter.dart | 2 +- src/components/FastMarker.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart index d3a9d83c8..e2c64381d 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart @@ -63,7 +63,7 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { final double endLeft = endMarker != null ? _getOffset(endMarker, epochToX, quoteToY).dx - : size.width - painterProps.yAxisWidth - 15; + : size.width; _drawShadedBarriers( canvas: canvas, diff --git a/src/components/FastMarker.tsx b/src/components/FastMarker.tsx index 561d9ae0e..975bea6a9 100644 --- a/src/components/FastMarker.tsx +++ b/src/components/FastMarker.tsx @@ -156,7 +156,7 @@ const FastMarker = (props: TFastMarkerProps) => { const { overlap_y_axis = true } = props; - const maxWidth = chartNode && !overlap_y_axis ? chartNode.offsetWidth - yAxisWidth - 79 : 'calc(100% - 70px)'; + const maxWidth = chartNode && !overlap_y_axis ? chartNode.offsetWidth - yAxisWidth - 50 : 'calc(100% - 50px)'; return (
From 00ab5c30f51965fb54d335a5406a09b828af961e Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 16 May 2024 13:49:19 +0800 Subject: [PATCH 10/11] fix: accumulator labels --- .../accumulator_marker_icon_painter.dart | 39 +++++++++---------- .../lib/src/painters/blink_tick_painter.dart | 4 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart index e2c64381d..79696d183 100644 --- a/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart +++ b/chart_app/lib/src/markers/marker_icon_painters/accumulator_marker_icon_painter.dart @@ -174,11 +174,11 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { if (highMarker.text != null) { final TextPainter textPainter = makeTextPainter(highMarker.text!, textStyle); - paintWithTextPainter( canvas, painter: textPainter, - anchor: Offset(endLeft - 1, displayedTop - 10), + anchor: Offset(endLeft - YAxisConfig.instance.cachedLabelWidth! - 1, + displayedTop - 10), anchorAlignment: Alignment.centerRight, ); } @@ -211,7 +211,8 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { paintWithTextPainter( canvas, painter: textPainter, - anchor: Offset(endLeft - 1, displayedBottom + 12), + anchor: Offset(endLeft - YAxisConfig.instance.cachedLabelWidth! - 1, + displayedBottom + 12), anchorAlignment: Alignment.centerRight, ); } @@ -235,23 +236,21 @@ class AccumulatorMarkerIconPainter extends TickMarkerIconPainter { Color circleColor, Color barrierColor, ) { - YAxisConfig.instance.yAxisClipping(canvas, size, () { - canvas.drawCircle( - Offset(startX, y), - 1.5, - Paint()..color = circleColor, - ); + canvas.drawCircle( + Offset(startX, y), + 1.5, + Paint()..color = circleColor, + ); - paintHorizontalDashedLine( - canvas, - startX, - endX, - y, - barrierColor, - 1.5, - dashWidth: 2, - dashSpace: 4, - ); - }); + paintHorizontalDashedLine( + canvas, + startX, + endX, + y, + barrierColor, + 1.5, + dashWidth: 2, + dashSpace: 4, + ); } } diff --git a/chart_app/lib/src/painters/blink_tick_painter.dart b/chart_app/lib/src/painters/blink_tick_painter.dart index 4465015b0..a2ff488c4 100644 --- a/chart_app/lib/src/painters/blink_tick_painter.dart +++ b/chart_app/lib/src/painters/blink_tick_painter.dart @@ -54,7 +54,7 @@ class BlinkingTickPainter if (animationInfo.currentTickPercent > 0 && animationInfo.currentTickPercent < 1) { - yAxisClipping(canvas, size, () { + YAxisConfig.instance.yAxisClipping(canvas, size, () { canvas.drawCircle( Offset(dotX!, y), 3 + (animationInfo.currentTickPercent * 6), @@ -62,7 +62,7 @@ class BlinkingTickPainter ); }); } - yAxisClipping(canvas, size, () { + YAxisConfig.instance.yAxisClipping(canvas, size, () { canvas.drawCircle( Offset(dotX!, y), 3, From 331d2f184628efd9d0143ad75e9888ddc114cf99 Mon Sep 17 00:00:00 2001 From: ahmadtaimoor-deriv <129935294+ahmadtaimoor-deriv@users.noreply.github.com> Date: Thu, 16 May 2024 16:47:15 +0800 Subject: [PATCH 11/11] trigger