AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

World wrap scrolling fix (#8903)

Browse Source
This commit is contained in:
Gualdimar 2023-03-15 08:37:09 +02:00 committed by GitHub
parent d3a419f8f8
commit 988f404ebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/ui/components/ZoomableScrollPane.kt
View File

@ -80,6 +80,17 @@ open class ZoomableScrollPane(
onViewportChanged() onViewportChanged()
} }
override fun setScrollX(pixels: Float) {
var result = pixels
if (continuousScrollingX) {
if (result < 0f) result += maxX
else if (result > maxX) result -= maxX
}
super.setScrollX(result)
}
override fun scrollY(pixelsY: Float) { override fun scrollY(pixelsY: Float) {
super.scrollY(pixelsY) super.scrollY(pixelsY)
updateCulling() updateCulling()
@ -293,15 +304,6 @@ open class ZoomableScrollPane(
scrollX = restrictX(deltaX) scrollX = restrictX(deltaX)
scrollY = restrictY(deltaY) scrollY = restrictY(deltaY)
when {
continuousScrollingX && scrollPercentX >= 1 && deltaX < 0 -> {
scrollPercentX = 0f
}
continuousScrollingX && scrollPercentX <= 0 && deltaX > 0-> {
scrollPercentX = 1f
}
}
//clamp() call is missing here but it doesn't seem to make any big difference in this case //clamp() call is missing here but it doesn't seem to make any big difference in this case
if ((isScrollX && deltaX != 0f || isScrollY && deltaY != 0f)) if ((isScrollX && deltaX != 0f || isScrollY && deltaY != 0f))