mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-05 07:49:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #164 - Removed zoom-out limitations

Browse Source
This commit is contained in:
Yair Morgenstern
2019-02-25 22:04:53 +02:00
parent 13f2f101a0
commit 52d6c998f2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
View File

@ -44,9 +44,10 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
}
actor = allTiles
setFillParent(true)
setOrigin(worldScreen.stage.width/2,worldScreen.stage.height/2)
setSize(worldScreen.stage.width, worldScreen.stage.height)
setSize(worldScreen.stage.width*2, worldScreen.stage.height*2)
setOrigin(width/2,height/2)
center(worldScreen.stage)
addZoomListener()
layout() // Fit the scroll pane to the contents - otherwise, setScroll won't work!
}
@ -62,7 +63,7 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
lastScale = scaleX
}
val scale: Float = Math.sqrt((distance / initialDistance).toDouble()).toFloat() * lastScale
if (scale < 1) return
if (scale < 0.5f) return
setScale(scale)
for (tilegroup in tileGroups.values.filter { it.cityButton != null })
tilegroup.cityButton!!.setScale(1 / scale)