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

Merge branch 'master' of https://github.com/yairm210/Unciv

Browse Source
This commit is contained in:
Yair Morgenstern 2020-05-26 16:35:56 +03:00
commit 40325a38b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -221,7 +221,7 @@ class CityScreen(internal val city: CityInfo): CameraStageBaseScreen() {
game.setScreen(CityScreen(civInfo.cities[indexOfNextCity])) game.setScreen(CityScreen(civInfo.cities[indexOfNextCity]))
} }
private fun getKeyboardListener(): InputListener = object: InputListener() { private fun getKeyboardListener(): InputListener = object : InputListener() {
override fun keyDown(event: InputEvent?, keyCode: Int): Boolean { override fun keyDown(event: InputEvent?, keyCode: Int): Boolean {
if (event == null) return super.keyDown(event, keyCode) if (event == null) return super.keyDown(event, keyCode)
when(event.keyCode) { when(event.keyCode) {

2
core/src/com/unciv/ui/utils/ZoomableScrollPane.kt
View File

@ -23,7 +23,7 @@ open class ZoomableScrollPane: ScrollPane(null) {
private fun addZoomListeners() { private fun addZoomListeners() {
addListener(object: InputListener() { addListener(object : InputListener() {
override fun scrolled(event: InputEvent?, x: Float, y: Float, amount: Int): Boolean { override fun scrolled(event: InputEvent?, x: Float, y: Float, amount: Int): Boolean {
if(amount > 0) zoom(scaleX * 0.8f) if(amount > 0) zoom(scaleX * 0.8f)
else zoom(scaleX / 0.8f) else zoom(scaleX / 0.8f)