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

UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

Browse Source 
This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.
This commit is contained in:
apk 2021-03-10 12:04:08 -05:00
parent 93fca672a5
commit d970632b20
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
if (!append) selectedUnits.clear()
selectedCity = null
if (unit != null) selectedUnits.add(unit)
//println(unit.toString())
}
var selectedCity : CityInfo? = null
@ -53,26 +54,14 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
promotionsTable.touchable=Touchable.enabled
add(VerticalGroup().apply {
pad(5f)
deselectUnitButton.add(ImageGetter.getImage("OtherIcons/Close")).size(20f).pad(10f)
deselectUnitButton.pack()
deselectUnitButton.touchable = Touchable.enabled
deselectUnitButton.onClick { selectUnit(); worldScreen.shouldUpdate=true; this@UnitTable.isVisible=false }
addActor(deselectUnitButton)
}).left()
add(Table().apply {
val moveBetweenUnitsTable = Table().apply {
add(prevIdleUnitButton)
val unitNameAndLabel = Table().apply {
add(unitIconHolder)
add(unitNameLabel).pad(5f)
add(nextIdleUnitButton)
}
add(moveBetweenUnitsTable).colspan(2).fill().row()
add(unitNameAndLabel)
separator= addSeparator().actor!!
separator = addSeparator().actor!!
add(promotionsTable).colspan(2).row()
add(unitDescriptionTable)
touchable = Touchable.enabled
@ -81,6 +70,20 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
worldScreen.mapHolder.setCenterPosition(it, false, false)
}
}
addSeparator().actor!!
add(Table().apply {
deselectUnitButton.add(ImageGetter.getImage("OtherIcons/Close")).size(20f).pad(10f)
deselectUnitButton.pack()
deselectUnitButton.touchable = Touchable.enabled
deselectUnitButton.onClick { selectUnit(); worldScreen.shouldUpdate=true; this@UnitTable.isVisible=false }
add(deselectUnitButton)
val idleUnitsSwitcher = Table().apply {
add(prevIdleUnitButton).left()
add(nextIdleUnitButton).left()
}
add(idleUnitsSwitcher).left()
}).left()
}).expand()
}
@ -106,7 +109,8 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
nextIdleUnitButton.disable()
}
if(selectedUnit!=null) { // set texts - this is valid even when it's the same unit, because movement points and health change
if(selectedUnit!=null) { // set texts - this is valid even when it's the same unit, because
// movement points and health change
if(selectedUnits.size==1) { //single selected unit
separator.isVisible = true
val unit = selectedUnit!!
@ -114,7 +118,9 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
if (unit.health < 100) nameLabelText += " (" + unit.health + ")"
if (nameLabelText != unitNameLabel.text.toString()) {
unitNameLabel.setText(nameLabelText)
selectedUnitHasChanged = true // We need to reload the health bar of the unit in the icon - happens e.g. when picking the Heal Instantly promotion
selectedUnitHasChanged = true // We need to reload the health bar of the unit in
// the icon - happens e.g. when picking the
// Heal Instantly promotion
}
unitDescriptionTable.clear()