AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Constructions table reorg - each piece has a self contained update

Browse Source
This commit is contained in:
Yair Morgenstern 2021-01-15 14:55:09 +02:00
parent 6c66600fce
commit 3a729874c2
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -54,44 +54,30 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
} }
fun update(selectedConstruction: IConstruction?) { fun update(selectedConstruction: IConstruction?) {
val queueScrollY = constructionsQueueScrollPane.scrollY
val constrScrollY = availableConstructionsScrollPane.scrollY
clearContent()
updateButtons(selectedConstruction) updateButtons(selectedConstruction)
updateConstructionQueue() updateConstructionQueue()
constructionsQueueScrollPane.layout()
constructionsQueueScrollPane.scrollY = queueScrollY
constructionsQueueScrollPane.updateVisualScroll()
getCell(constructionsQueueScrollPane).maxHeight(stage.height / 3 - 10f)
// Need to pack before computing space left for bottom panel // Need to pack before computing space left for bottom panel
pack() pack()
val usedHeight = showCityInfoTableButton.height + constructionsQueueScrollPane.height + buttons.height + 3f * pad + 10f
updateAvailableConstructions() updateAvailableConstructions()
availableConstructionsScrollPane.layout()
availableConstructionsScrollPane.scrollY = constrScrollY
availableConstructionsScrollPane.updateVisualScroll()
getCell(availableConstructionsScrollPane).maxHeight(stage.height - usedHeight)
pack() pack()
} }
private fun clearContent() {
constructionsQueueTable.clear()
buttons.clear()
availableConstructionsTable.clear()
}
private fun updateButtons(construction: IConstruction?) { private fun updateButtons(construction: IConstruction?) {
buttons.clear()
buttons.add(getQueueButton(construction)).padRight(5f) buttons.add(getQueueButton(construction)).padRight(5f)
buttons.add(getBuyButton(construction)) buttons.add(getBuyButton(construction))
} }
private fun updateConstructionQueue() { private fun updateConstructionQueue() {
val queueScrollY = constructionsQueueScrollPane.scrollY
constructionsQueueTable.clear()
val city = cityScreen.city val city = cityScreen.city
val cityConstructions = city.cityConstructions val cityConstructions = city.cityConstructions
val currentConstruction = cityConstructions.currentConstructionFromQueue val currentConstruction = cityConstructions.currentConstructionFromQueue
@ -123,6 +109,12 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
} }
} else } else
constructionsQueueTable.add("Queue empty".toLabel()).pad(2f).row() constructionsQueueTable.add("Queue empty".toLabel()).pad(2f).row()
constructionsQueueScrollPane.layout()
constructionsQueueScrollPane.scrollY = queueScrollY
constructionsQueueScrollPane.updateVisualScroll()
getCell(constructionsQueueScrollPane).maxHeight(stage.height / 3 - 10f)
} }
private fun getConstructionButtonDTOs():ArrayList<ConstructionButtonDTO> { private fun getConstructionButtonDTOs():ArrayList<ConstructionButtonDTO> {
@ -167,6 +159,10 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
} }
private fun updateAvailableConstructions() { private fun updateAvailableConstructions() {
val constrScrollY = availableConstructionsScrollPane.scrollY
val usedHeight = showCityInfoTableButton.height + constructionsQueueScrollPane.height + buttons.height + 3f * pad + 10f
availableConstructionsTable.clear()
val units = ArrayList<Table>() val units = ArrayList<Table>()
val buildableWonders = ArrayList<Table>() val buildableWonders = ArrayList<Table>()
val buildableNationalWonders = ArrayList<Table>() val buildableNationalWonders = ArrayList<Table>()
@ -175,7 +171,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
val constructionButtonDTOList = getConstructionButtonDTOs() val constructionButtonDTOList = getConstructionButtonDTOs()
for(dto in constructionButtonDTOList) { for (dto in constructionButtonDTOList) {
val constructionButton = getConstructionButton(dto) val constructionButton = getConstructionButton(dto)
when (dto.construction) { when (dto.construction) {
is BaseUnit -> units.add(constructionButton) is BaseUnit -> units.add(constructionButton)
@ -195,6 +191,12 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
availableConstructionsTable.addCategory("National Wonders", buildableNationalWonders, constructionsQueueTable.width) availableConstructionsTable.addCategory("National Wonders", buildableNationalWonders, constructionsQueueTable.width)
availableConstructionsTable.addCategory("Buildings", buildableBuildings, constructionsQueueTable.width) availableConstructionsTable.addCategory("Buildings", buildableBuildings, constructionsQueueTable.width)
availableConstructionsTable.addCategory("Other", specialConstructions, constructionsQueueTable.width) availableConstructionsTable.addCategory("Other", specialConstructions, constructionsQueueTable.width)
availableConstructionsScrollPane.layout()
availableConstructionsScrollPane.scrollY = constrScrollY
availableConstructionsScrollPane.updateVisualScroll()
getCell(availableConstructionsScrollPane).maxHeight(stage.height - usedHeight)
} }
private fun getQueueEntry(constructionQueueIndex: Int, name: String): Table { private fun getQueueEntry(constructionQueueIndex: Int, name: String): Table {