Merge branch 'dev' into master

imaNNeo · Jan 25, 2021 · 4fda5a4 · 4fda5a4 · roberteverman · Jan 26, 2021
2 parents 8f97298 + 34d3fe6
commit 4fda5a4
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/lib/src/chart/pie_chart/pie_chart.dart b/lib/src/chart/pie_chart/pie_chart.dart
@@ -1,9 +1,8 @@
-import 'package:flutter/material.dart';
-
 import 'package:fl_chart/src/chart/base/base_chart/base_chart_painter.dart';
 import 'package:fl_chart/src/chart/base/base_chart/touch_input.dart';
 import 'package:fl_chart/src/chart/pie_chart/pie_chart_painter.dart';
 import 'package:fl_chart/src/utils/utils.dart';
+import 'package:flutter/material.dart';
 
 import 'pie_chart_data.dart';
 
@@ -199,15 +198,19 @@ class _PieChartState extends AnimatedWidgetBaseState<PieChart> {
               });
             },
           ),
-          child: badgeWidgets(),
+          child: LayoutBuilder(
+            builder: (BuildContext context, BoxConstraints constraints) {
+              return badgeWidgets(constraints);
+            },
+          ),
         ),
       ),
     );
   }
 
-  Widget badgeWidgets() {
-    final chartSize = _getChartSize();
-    if (chartSize != null && _widgetsPositionHandler != null) {
+  Widget badgeWidgets(BoxConstraints constraints) {
+    final chartSize = constraints.biggest;
+    if (_widgetsPositionHandler != null) {
       final offsetsMap = _widgetsPositionHandler.getBadgeOffsets(chartSize);
       if (offsetsMap.isNotEmpty) {
         return CustomMultiChildLayout(