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

Resolved #2040 - Moved the turn counter on the top bar to the second level, to even out both levels

Browse Source
This commit is contained in:
Yair Morgenstern
2020-03-05 23:29:42 +02:00
parent 8ab7f7ae50
commit 5117a498f9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
View File

@ -57,6 +57,7 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
private fun getResourceTable(): Table { private fun getResourceTable(): Table {
val resourceTable = Table() val resourceTable = Table()
resourceTable.defaults().pad(5f) resourceTable.defaults().pad(5f)
resourceTable.add(turnsLabel).padRight(20f)
val revealedStrategicResources = worldScreen.gameInfo.ruleSet.tileResources.values val revealedStrategicResources = worldScreen.gameInfo.ruleSet.tileResources.values
.filter { it.resourceType == ResourceType.Strategic } // && currentPlayerCivInfo.tech.isResearched(it.revealedBy!!) } .filter { it.resourceType == ResourceType.Strategic } // && currentPlayerCivInfo.tech.isResearched(it.revealedBy!!) }
for (resource in revealedStrategicResources) { for (resource in revealedStrategicResources) {
@ -74,7 +75,6 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() {
private fun getStatsTable(): Table { private fun getStatsTable(): Table {
val statsTable = Table() val statsTable = Table()
statsTable.defaults().pad(3f)//.align(Align.top) statsTable.defaults().pad(3f)//.align(Align.top)
statsTable.add(turnsLabel).padRight(20f)
statsTable.add(goldLabel) statsTable.add(goldLabel)
statsTable.add(ImageGetter.getStatIcon("Gold")).padRight(20f).size(20f) statsTable.add(ImageGetter.getStatIcon("Gold")).padRight(20f).size(20f)
statsTable.add(scienceLabel) //.apply { setAlignment(Align.center) }).align(Align.top) statsTable.add(scienceLabel) //.apply { setAlignment(Align.center) }).align(Align.top)