@@ -232,10 +232,13 @@ open class LegendRenderer(
232232
233233 when (horizontalAlignment) {
234234 LegendHorizontalAlignment .LEFT -> {
235- originPosX = if (orientation == LegendOrientation .VERTICAL ) xOffset
236- else viewPortHandler.contentLeft() + xOffset
235+ originPosX = if (orientation == LegendOrientation .VERTICAL )
236+ xOffset
237+ else
238+ viewPortHandler.contentLeft() + xOffset
237239
238- if (direction == LegendDirection .RIGHT_TO_LEFT ) originPosX + = legend.neededWidth
240+ if (direction == LegendDirection .RIGHT_TO_LEFT )
241+ originPosX + = legend.neededWidth
239242 }
240243
241244 LegendHorizontalAlignment .RIGHT -> {
@@ -285,11 +288,13 @@ open class LegendRenderer(
285288 var lineIndex = 0
286289
287290 var i = 0
288- val count = entries.size
289- while (i < count) {
290- val e = entries[i]
291- val drawingForm = e.form != LegendForm .NONE
292- val formSize = if (java.lang.Float .isNaN(e.formSize)) defaultFormSize else e.formSize.convertDpToPixel()
291+ while (i < entries.size) {
292+ val entry = entries[i]
293+ val drawingForm = entry.form != LegendForm .NONE
294+ val formSize = if (java.lang.Float .isNaN(entry.formSize))
295+ defaultFormSize
296+ else
297+ entry.formSize.convertDpToPixel()
293298
294299 if (i < calculatedLabelBreakPoints.size && calculatedLabelBreakPoints[i] == true ) {
295300 posX = originPosX
@@ -306,12 +311,12 @@ open class LegendRenderer(
306311 lineIndex++
307312 }
308313
309- val isStacked = e .label == null // grouped forms have null labels
314+ val isStacked = entry .label == null // grouped forms have null labels
310315
311316 if (drawingForm) {
312317 if (direction == LegendDirection .RIGHT_TO_LEFT ) posX - = formSize
313318
314- drawForm(canvas, posX, posY + formYOffset, e , legend)
319+ drawForm(canvas, posX, posY + formYOffset, entry , legend)
315320
316321 if (direction == LegendDirection .LEFT_TO_RIGHT ) posX + = formSize
317322 }
@@ -322,8 +327,8 @@ open class LegendRenderer(
322327 if (direction == LegendDirection .RIGHT_TO_LEFT )
323328 posX - = calculatedLabelSizes[i]?.width ? : 0f
324329
325- if (e .label != null )
326- drawLabel(canvas, posX, posY + labelLineHeight, e .label!! )
330+ if (entry .label != null )
331+ drawLabel(canvas, posX, posY + labelLineHeight, entry .label!! )
327332
328333 if (direction == LegendDirection .LEFT_TO_RIGHT )
329334 posX + = calculatedLabelSizes[i]?.width ? : 0f
0 commit comments