@@ -428,6 +428,7 @@ export class PieChartRenderer extends DataRenderer {
428
428
429
429
const paint = this . valuePaint ;
430
430
const entryLabelsPaint : Paint = drawEntryLabels ? this . entryLabelsPaint : undefined ;
431
+ const customRender = this . mChart . getCustomRenderer ( ) ;
431
432
for ( let i = 0 ; i < dataSets . length ; i ++ ) {
432
433
const dataSet = dataSets [ i ] ;
433
434
const drawValues = dataSet . isDrawValuesEnabled ( ) ;
@@ -455,6 +456,7 @@ export class PieChartRenderer extends DataRenderer {
455
456
const sliceSpace = this . getSliceSpace ( dataSet ) ;
456
457
457
458
const iconsOffset = dataSet . getIconsOffset ( ) ;
459
+ const valuesOffset = dataSet . getValuesOffset ( ) ;
458
460
459
461
const isDrawIconsEnabled = dataSet . isDrawIconsEnabled ( ) ;
460
462
for ( let j = 0 ; j < entryCount ; j ++ ) {
@@ -548,7 +550,7 @@ export class PieChartRenderer extends DataRenderer {
548
550
549
551
// draw everything, depending on settings
550
552
if ( drawXOutside && drawYOutside ) {
551
- this . drawValue ( c , formattedValue , labelPtx , labelPty , dataSet . getValueTextColor ( j ) , paint ) ;
553
+ this . drawValue ( c , formattedValue , labelPtx + valuesOffset . x , labelPty + valuesOffset . y , dataSet . getValueTextColor ( j ) , paint , customRender ) ;
552
554
553
555
if ( j < data . getEntryCount ( ) && entryLabel != null ) {
554
556
this . drawEntryLabel ( c , entryLabel , labelPtx , labelPty + lineHeight , entryLabelsPaint ) ;
@@ -558,7 +560,7 @@ export class PieChartRenderer extends DataRenderer {
558
560
this . drawEntryLabel ( c , entryLabel , labelPtx , labelPty + lineHeight / 2 , entryLabelsPaint ) ;
559
561
}
560
562
} else if ( drawYOutside ) {
561
- this . drawValue ( c , formattedValue , labelPtx , labelPty + lineHeight / 2 , dataSet . getValueTextColor ( j ) , paint ) ;
563
+ this . drawValue ( c , formattedValue , labelPtx + valuesOffset . x , labelPty + valuesOffset . y + lineHeight / 2 , dataSet . getValueTextColor ( j ) , paint , customRender ) ;
562
564
}
563
565
}
564
566
@@ -571,7 +573,7 @@ export class PieChartRenderer extends DataRenderer {
571
573
572
574
// draw everything, depending on settings
573
575
if ( drawXInside && drawYInside ) {
574
- this . drawValue ( c , formattedValue , x , y , dataSet . getValueTextColor ( j ) , paint ) ;
576
+ this . drawValue ( c , formattedValue , x + valuesOffset . x , y + valuesOffset . y , dataSet . getValueTextColor ( j ) , paint , customRender ) ;
575
577
576
578
if ( j < data . getEntryCount ( ) && entryLabel != null ) {
577
579
this . drawEntryLabel ( c , entryLabel , x , y + lineHeight , entryLabelsPaint ) ;
@@ -581,7 +583,7 @@ export class PieChartRenderer extends DataRenderer {
581
583
this . drawEntryLabel ( c , entryLabel , x , y + lineHeight / 2 , entryLabelsPaint ) ;
582
584
}
583
585
} else if ( drawYInside ) {
584
- this . drawValue ( c , formattedValue , x , y + lineHeight / 2 , dataSet . getValueTextColor ( j ) , paint ) ;
586
+ this . drawValue ( c , formattedValue , x + valuesOffset . x , y + valuesOffset . y + lineHeight / 2 , dataSet . getValueTextColor ( j ) , paint , customRender ) ;
585
587
}
586
588
}
587
589
@@ -601,11 +603,6 @@ export class PieChartRenderer extends DataRenderer {
601
603
c . restore ( ) ;
602
604
}
603
605
604
- public drawValue ( c : Canvas , valueText , x , y , color , paint : Paint ) {
605
- paint . setColor ( color ) ;
606
- c . drawText ( valueText , x , y , paint ) ;
607
- }
608
-
609
606
/**
610
607
* Draws an entry label at the specified position.
611
608
*
0 commit comments