Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Scrolling List #3375

Merged
merged 3 commits into from
Feb 9, 2025
Merged

Fix: Scrolling List #3375

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bd56ce
scrolling List fix
Thunderblade73 Feb 2, 2025
12c799c
fixed edge case
Thunderblade73 Feb 6, 2025
d6bd40a
fixed
Thunderblade73 Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.HorizontalAlignment
import at.hannibal2.skyhanni.utils.RenderUtils.VerticalAlignment
import at.hannibal2.skyhanni.utils.compat.getTooltipCompat
import at.hannibal2.skyhanni.utils.guide.GuideGUI
import at.hannibal2.skyhanni.utils.renderables.Renderable.Companion.shouldAllowLink
import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.calculateTableXOffsets
import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.calculateTableYOffsets
import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXAligned
Expand Down Expand Up @@ -1044,7 +1045,7 @@ interface Renderable {
private val scrollUpTip = string("§7§oMore items above (scroll)")
private val scrollDownTip = string("§7§oMore items below (scroll)")

override var width = list.maxOf { it.width }
override val width = maxOf(list.maxOfOrNull { it.width } ?: 0, scrollDownTip.width)
override val height = height
override val horizontalAlign = horizontalAlign
override val verticalAlign = verticalAlign
Expand All @@ -1054,7 +1055,7 @@ interface Renderable {
private val scroll = ScrollInput.Companion.Vertical(
scrollValue,
0,
virtualHeight - height,
virtualHeight - height + if (showScrollableTipsInList && virtualHeight > height) scrollUpTip.height else 0,
velocity,
button,
)
Expand All @@ -1070,44 +1071,44 @@ interface Renderable {
var virtualY = 0
var found = false

var negativeSpace = 0

// If showScrollableTipsInList is true, and we are scrolled 'down', display a tip indicating
// there are more items above
if (showScrollableTipsInList && scroll.asInt() > 0) {
width = maxOf(width, scrollUpTip.width)
scrollUpTip.renderXAligned(posX, posY, width)
GlStateManager.translate(0f, scrollUpTip.height.toFloat(), 0f)
renderY += scrollUpTip.height
virtualY += scrollUpTip.height
negativeSpace -= scrollUpTip.height
}

val atScrollEnd = scroll.asInt() == virtualHeight - height
val atScrollEnd = scroll.asInt() >= virtualHeight - height
if (!atScrollEnd) {
virtualY += scrollDownTip.height
renderY += scrollDownTip.height
negativeSpace -= scrollDownTip.height
}

val window = scroll.asInt()..(end + negativeSpace)

for (renderable in list) {
if ((virtualY..virtualY + renderable.height) in scroll.asInt()..end) {
if ((virtualY..virtualY + renderable.height) in window) {
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 + renderable.height <= height) {
if (renderY + renderable.height <= height + negativeSpace) {
renderable.renderXAligned(posX, posY + renderY, width)
}
continue
break
}
virtualY += renderable.height
}

// If showScrollableTipsInList is true, and we are scrolled 'up', display a tip indicating
// there are more items below
if (showScrollableTipsInList && virtualY > end) {
width = maxOf(width, scrollDownTip.width)
if (showScrollableTipsInList && !atScrollEnd) {
scrollDownTip.renderXAligned(posX, posY + height - scrollDownTip.height, width)
GlStateManager.translate(0f, scrollDownTip.height.toFloat(), 0f)
}

GlStateManager.translate(0f, -renderY.toFloat(), 0f)
Expand Down
Loading