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

UnitTable close button mouseover (#9998)

Browse Source
This commit is contained in:
SomeTroglodyte 2023-08-29 21:11:56 +02:00 committed by GitHub
parent 1fa2d945c3
commit bf687f2f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt
View File

@ -2,11 +2,11 @@ package com.unciv.ui.screens.worldscreen.unit
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
import com.unciv.Constants
import com.unciv.logic.battle.CityCombatant
import com.unciv.logic.city.City
@ -17,6 +17,7 @@ import com.unciv.ui.components.UnitGroup
import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.center
import com.unciv.ui.components.extensions.darken
import com.unciv.ui.components.extensions.toImageButton
import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.components.input.onClick
import com.unciv.ui.images.ImageGetter
@ -57,7 +58,6 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
}
var selectedCity : City? = null
private val deselectUnitButton = Table()
// This is so that not on every update(), we will update the unit table.
// Most of the time it's the same unit with the same stats so why waste precious time?
@ -80,20 +80,13 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
promotionsTable.touchable = Touchable.enabled
add(VerticalGroup().apply {
pad(5f)
touchable = Touchable.enabled
onClick {
selectUnit()
worldScreen.shouldUpdate = true
this@UnitTable.isVisible = false
}
deselectUnitButton.add(ImageGetter.getImage("OtherIcons/Close")).size(20f).pad(10f)
deselectUnitButton.pack()
deselectUnitButton.touchable = Touchable.enabled
addActor(deselectUnitButton)
}).left()
val deselectUnitButton = "OtherIcons/Close".toImageButton(20f, 50f, Color.CLEAR, Color.RED)
deselectUnitButton.onClick {
selectUnit()
worldScreen.shouldUpdate = true
this@UnitTable.isVisible = false
}
add(deselectUnitButton).left()
add(Table().apply {
val moveBetweenUnitsTable = Table().apply {