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

City overview force consistent row height (#3861)

Browse Source 
* City overview force consistent row height

* City overview force consistent row height - simpler
This commit is contained in:
SomeTroglodyte
2021-05-06 14:48:58 +02:00
committed by GitHub
parent 7f937e9784
commit c622a3d9fd
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/unciv/ui/overviewscreen/CityOverviewTable.kt
View File

@ -114,6 +114,7 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
} }
private fun fillCitiesTable(citiesTable: Table, sortType: String, descending: Boolean) { private fun fillCitiesTable(citiesTable: Table, sortType: String, descending: Boolean) {
if (viewingPlayer.cities.isEmpty()) return
val sorter = Comparator { city2, city1: CityInfo -> val sorter = Comparator { city2, city1: CityInfo ->
when { when {
@ -131,13 +132,17 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
if (descending) if (descending)
cityList = cityList.reversed() cityList = cityList.reversed()
val constructionCells: MutableList<Cell<Label>> = mutableListOf()
for (city in cityList) { for (city in cityList) {
val button = Button(city.name.toLabel(), CameraStageBaseScreen.skin) val button = Button(city.name.toLabel(), CameraStageBaseScreen.skin)
button.onClick { button.onClick {
overviewScreen.game.setScreen(CityScreen(city)) overviewScreen.game.setScreen(CityScreen(city))
} }
citiesTable.add(button) citiesTable.add(button)
citiesTable.add(city.cityConstructions.getCityProductionTextForCityButton().toLabel())
val cell = citiesTable.add(city.cityConstructions.getCityProductionTextForCityButton().toLabel())
constructionCells.add(cell)
citiesTable.add(city.population.population.toLabel()).myAlign(Align.center) citiesTable.add(city.population.population.toLabel()).myAlign(Align.center)
for (column in columnsNames) { for (column in columnsNames) {
if (!column.isStat()) continue if (!column.isStat()) continue
@ -145,6 +150,12 @@ class CityOverviewTable(val viewingPlayer: CivilizationInfo, val overviewScreen:
} }
citiesTable.row() citiesTable.row()
} }
// row heights may diverge - fix it by setting minHeight to
// largest actual height (of the construction cell) - !! guarded by isEmpty test above
val largestLabelHeight = constructionCells.maxByOrNull{ it.prefHeight }!!.prefHeight
constructionCells.forEach{ it.minHeight(largestLabelHeight ) }
citiesTable.pack() citiesTable.pack()
} }