AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Trades in overview screen are now almost symmetrical

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-17 21:37:27 +02:00
parent aa4c70f090
commit 80d9b3bd49
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -114,8 +114,8 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
private fun createTradeTable(trade: Trade, otherCiv:CivilizationInfo): Table { private fun createTradeTable(trade: Trade, otherCiv:CivilizationInfo): Table {
val generalTable = Table(skin) val generalTable = Table(skin)
generalTable.add(createOffersTable(currentPlayerCivInfo,trade.ourOffers, trade.theirOffers.size)).top() generalTable.add(createOffersTable(currentPlayerCivInfo,trade.ourOffers, trade.theirOffers.size)).fillY()
generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)).top() generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)).fillY()
return generalTable return generalTable
} }
@ -126,11 +126,12 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
table.add(civ.civName.toLabel(civ.nation.getInnerColor())).row() table.add(civ.civName.toLabel(civ.nation.getInnerColor())).row()
table.addSeparator() table.addSeparator()
for(offer in offersList){ for(offer in offersList){
val offerText = offer.getOfferText() var offerText = offer.getOfferText()
if(!offerText.contains("\n")) offerText+="\n"
table.add(offerText.toLabel(civ.nation.getInnerColor())).row() table.add(offerText.toLabel(civ.nation.getInnerColor())).row()
} }
for(i in 1..numberOfOtherSidesOffers - offersList.size) for(i in 1..numberOfOtherSidesOffers - offersList.size)
table.add("".toLabel()).row() // we want both sides of the general table to have the same number of rows table.add("\n".toLabel()).row() // we want both sides of the general table to have the same number of rows
return table return table
} }