Corrected legend to center while wrapping in both "above" and "below"

Fixes the bug introduced by 0ee538c
PhilJay · Mar 31, 2016 · 2e41714 · 2e41714
1 parent 5430750
commit 2e41714
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/LegendRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/LegendRenderer.java
@@ -232,7 +232,7 @@ public void renderLegend(Canvas c) {
                     if (direction == Legend.LegendDirection.LEFT_TO_RIGHT)
                         originPosX -= mLegend.mNeededWidth;
                 } else // BELOW_CHART_CENTER || ABOVE_CHART_CENTER
-                    originPosX = mViewPortHandler.contentLeft() + contentWidth / 2.f - mLegend.mNeededWidth / 2f;
+                    originPosX = mViewPortHandler.contentLeft() + contentWidth / 2.f;
 
                 FSize[] calculatedLineSizes = mLegend.getCalculatedLineSizes();
                 FSize[] calculatedLabelSizes = mLegend.getCalculatedLabelSizes();
@@ -256,7 +256,10 @@ public void renderLegend(Canvas c) {
                         posY += labelLineHeight + labelLineSpacing;
                     }
 
-                    if (posX == originPosX && legendPosition == Legend.LegendPosition.BELOW_CHART_CENTER && lineIndex < calculatedLineSizes.length) {
+                    if (posX == originPosX &&
+                        (legendPosition == Legend.LegendPosition.BELOW_CHART_CENTER ||
+                        legendPosition == Legend.LegendPosition.ABOVE_CHART_CENTER) &&
+                        lineIndex < calculatedLineSizes.length) {
                         posX += (direction == Legend.LegendDirection.RIGHT_TO_LEFT ? calculatedLineSizes[lineIndex].width : -calculatedLineSizes[lineIndex].width) / 2.f;
                         lineIndex++;
                     }