diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-06-13 22:21:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 22:21:50 +0200 |
| commit | 529639fdd0683066eadffe93473a300a2177c008 (patch) | |
| tree | d89cd9aa2c04b4a8a839b9c3b1a56d2058fa7956 /src/main/java/at/hannibal2/skyhanni/utils/renderables | |
| parent | 151865bca064421d48ec19279b759134fc428443 (diff) | |
| download | skyhanni-529639fdd0683066eadffe93473a300a2177c008.tar.gz skyhanni-529639fdd0683066eadffe93473a300a2177c008.tar.bz2 skyhanni-529639fdd0683066eadffe93473a300a2177c008.zip | |
Backend: for each (#1725)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils/renderables')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt index 870a3a2f2..6079f79d5 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt @@ -501,8 +501,8 @@ interface Renderable { val emptySpaceY = if (useEmptySpace) 0 else yPadding override fun render(posX: Int, posY: Int) { - content.forEachIndexed { rowIndex, row -> - row.forEachIndexed { index, renderable -> + for ((rowIndex, row) in content.withIndex()) { + for ((index, renderable) in row.withIndex()) { GlStateManager.pushMatrix() GlStateManager.translate(xOffsets[index].toFloat(), yOffsets[rowIndex].toFloat(), 0F) renderable?.renderXYAligned( @@ -747,20 +747,20 @@ interface Renderable { var renderY = 0 var virtualY = 0 var found = false - list.forEach { - if ((virtualY..virtualY + it.height) in scroll.asInt()..end) { - it.renderXAligned(posX, posY + renderY, width) - GlStateManager.translate(0f, it.height.toFloat(), 0f) - renderY += it.height + for (renderable in list) { + if ((virtualY..virtualY + renderable.height) in scroll.asInt()..end) { + renderable.renderXAligned(posX, posY + renderY, width) + GlStateManager.translate(0f, renderable.height.toFloat(), 0f) + renderY += renderable.height found = true } else if (found) { found = false - if (renderY + it.height <= height) { - it.renderXAligned(posX, posY + renderY, width) + if (renderY + renderable.height <= height) { + renderable.renderXAligned(posX, posY + renderY, width) } - return@forEach + continue } - virtualY += it.height + virtualY += renderable.height } GlStateManager.translate(0f, -renderY.toFloat(), 0f) } @@ -807,7 +807,7 @@ interface Renderable { var renderY = 0 if (hasHeader) { - content[0].forEachIndexed { index, renderable -> + for ((index, renderable) in content[0].withIndex()) { GlStateManager.translate(xOffsets[index].toFloat(), 0f, 0f) renderable?.renderXYAligned( posX + xOffsets[index], @@ -834,7 +834,7 @@ interface Renderable { } for (rowIndex in range2) { - content[rowIndex].forEachIndexed { index, renderable -> + for ((index, renderable) in content[rowIndex].withIndex()) { GlStateManager.translate(xOffsets[index].toFloat(), 0f, 0f) renderable?.renderXYAligned( posX + xOffsets[index], |