wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moving city button with absolute coordinates to prevent it from wandering around (#794)

Browse source
This commit is contained in:
martin 2019-05-23 13:22:58 +02:00 committed by Yair Morgenstern
parent eb3ba51396
commit b49270e690
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/com/unciv/ui/tilegroups/CityButton.kt
View file

@ -105,7 +105,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
private fun moveButtonDown() { private fun moveButtonDown() {
val moveButtonAction = Actions.sequence( val moveButtonAction = Actions.sequence(
Actions.moveBy(0f, -height, 0.4f, Interpolation.swingOut), Actions.moveTo(tileGroup.x, tileGroup.y-height, 0.4f, Interpolation.swingOut),
Actions.run { isButtonMoved=true } Actions.run { isButtonMoved=true }
) )
parent.addAction(moveButtonAction) // Move the whole cityButtonLayerGroup down, so the citybutton remains clickable parent.addAction(moveButtonAction) // Move the whole cityButtonLayerGroup down, so the citybutton remains clickable
@ -113,7 +113,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
private fun moveButtonUp() { private fun moveButtonUp() {
val floatAction = Actions.sequence( val floatAction = Actions.sequence(
Actions.moveBy(0f, height, 0.4f, Interpolation.sine), Actions.moveTo(tileGroup.x, tileGroup.y, 0.4f, Interpolation.sine),
Actions.run {isButtonMoved=false} Actions.run {isButtonMoved=false}
) )
parent.addAction(floatAction) parent.addAction(floatAction)