From f6822f532bb3ac821c5d26b5a56d5ff2433721dd Mon Sep 17 00:00:00 2001 From: Jaime Blasco Date: Wed, 13 Nov 2019 11:43:52 +0100 Subject: [PATCH 1/2] Replazed chartSize to containerRenderBox.constraints.biggest --- lib/src/chart/bar_chart/bar_chart.dart | 4 ++-- lib/src/chart/line_chart/line_chart.dart | 4 ++-- lib/src/chart/pie_chart/pie_chart.dart | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/chart/bar_chart/bar_chart.dart b/lib/src/chart/bar_chart/bar_chart.dart index 1acd0ea3d..64371f6e0 100644 --- a/lib/src/chart/bar_chart/bar_chart.dart +++ b/lib/src/chart/bar_chart/bar_chart.dart @@ -86,7 +86,7 @@ class BarChartState extends AnimatedWidgetBaseState { }, child: CustomPaint( key: _chartKey, - size: getDefaultSize(context), + size: chartSize, painter: BarChartPainter( _withTouchedIndicators(_barChartDataTween.evaluate(animation)), _withTouchedIndicators(showingData), @@ -132,7 +132,7 @@ class BarChartState extends AnimatedWidgetBaseState { Size _getChartSize() { if (_chartKey.currentContext != null) { final RenderBox containerRenderBox = _chartKey.currentContext.findRenderObject(); - return containerRenderBox.size; + return containerRenderBox.constraints.biggest; } else { return getDefaultSize(context); } diff --git a/lib/src/chart/line_chart/line_chart.dart b/lib/src/chart/line_chart/line_chart.dart index 5c2a3593c..ee63b2c42 100644 --- a/lib/src/chart/line_chart/line_chart.dart +++ b/lib/src/chart/line_chart/line_chart.dart @@ -91,7 +91,7 @@ class LineChartState extends AnimatedWidgetBaseState { }, child: CustomPaint( key: _chartKey, - size: getDefaultSize(context), + size: chartSize, painter: LineChartPainter( _withTouchedIndicators(_lineChartDataTween.evaluate(animation)), _withTouchedIndicators(showingData), @@ -132,7 +132,7 @@ class LineChartState extends AnimatedWidgetBaseState { Size _getChartSize() { if (_chartKey.currentContext != null) { final RenderBox containerRenderBox = _chartKey.currentContext.findRenderObject(); - return containerRenderBox.size; + return containerRenderBox.constraints.biggest; } else { return getDefaultSize(context); } diff --git a/lib/src/chart/pie_chart/pie_chart.dart b/lib/src/chart/pie_chart/pie_chart.dart index 50db48b89..7ec7ec213 100644 --- a/lib/src/chart/pie_chart/pie_chart.dart +++ b/lib/src/chart/pie_chart/pie_chart.dart @@ -87,7 +87,7 @@ class PieChartState extends AnimatedWidgetBaseState { }, child: CustomPaint( key: _chartKey, - size: getDefaultSize(context), + size: chartSize, painter: PieChartPainter( _pieChartDataTween.evaluate(animation), showingData, @@ -108,7 +108,7 @@ class PieChartState extends AnimatedWidgetBaseState { Size _getChartSize() { if (_chartKey.currentContext != null) { final RenderBox containerRenderBox = _chartKey.currentContext.findRenderObject(); - return containerRenderBox.size; + return containerRenderBox.constraints.biggest; } else { return getDefaultSize(context); } From f60a6edceb78f1ff615d0631ee6a1da455f3a819 Mon Sep 17 00:00:00 2001 From: Jaime Blasco Date: Mon, 18 Nov 2019 11:46:30 +0100 Subject: [PATCH 2/2] Set back defaultSize to CustomPaint --- lib/src/chart/bar_chart/bar_chart.dart | 2 +- lib/src/chart/line_chart/line_chart.dart | 2 +- lib/src/chart/pie_chart/pie_chart.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/chart/bar_chart/bar_chart.dart b/lib/src/chart/bar_chart/bar_chart.dart index 64371f6e0..5861169cd 100644 --- a/lib/src/chart/bar_chart/bar_chart.dart +++ b/lib/src/chart/bar_chart/bar_chart.dart @@ -86,7 +86,7 @@ class BarChartState extends AnimatedWidgetBaseState { }, child: CustomPaint( key: _chartKey, - size: chartSize, + size: getDefaultSize(context), painter: BarChartPainter( _withTouchedIndicators(_barChartDataTween.evaluate(animation)), _withTouchedIndicators(showingData), diff --git a/lib/src/chart/line_chart/line_chart.dart b/lib/src/chart/line_chart/line_chart.dart index ee63b2c42..0b767699b 100644 --- a/lib/src/chart/line_chart/line_chart.dart +++ b/lib/src/chart/line_chart/line_chart.dart @@ -91,7 +91,7 @@ class LineChartState extends AnimatedWidgetBaseState { }, child: CustomPaint( key: _chartKey, - size: chartSize, + size: getDefaultSize(context), painter: LineChartPainter( _withTouchedIndicators(_lineChartDataTween.evaluate(animation)), _withTouchedIndicators(showingData), diff --git a/lib/src/chart/pie_chart/pie_chart.dart b/lib/src/chart/pie_chart/pie_chart.dart index 7ec7ec213..436d474f6 100644 --- a/lib/src/chart/pie_chart/pie_chart.dart +++ b/lib/src/chart/pie_chart/pie_chart.dart @@ -87,7 +87,7 @@ class PieChartState extends AnimatedWidgetBaseState { }, child: CustomPaint( key: _chartKey, - size: chartSize, + size: getDefaultSize(context), painter: PieChartPainter( _pieChartDataTween.evaluate(animation), showingData,