AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3341 - City-state diplomacy screen is shown properly when entering from a city button

Browse Source
This commit is contained in:
Yair Morgenstern 2020-11-15 21:58:16 +02:00
parent f7a1633c33
commit 952e4cb958
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -97,7 +97,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
private fun getCityStateDiplomacyTable(otherCiv: CivilizationInfo): Table {
val otherCivDiplomacyManager = otherCiv.getDiplomacyManager(viewingCiv)
val diplomacyTable = Table().apply { width = this@DiplomacyScreen.stage.width - leftSideTable.width }
val diplomacyTable = Table()
diplomacyTable.defaults().pad(10f)
diplomacyTable.add(otherCiv.getLeaderDisplayName().toLabel(fontSize = 24)).row()
diplomacyTable.add("{Type: } {${otherCiv.cityStateType}}".toLabel()).row()
@ -137,8 +137,8 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
friendBonusLabelColor = Color.GRAY
val friendBonusLabel = friendBonusText.toLabel(friendBonusLabelColor)
.apply { setWrap(true); setAlignment(Align.center) }
diplomacyTable.add(friendBonusLabel).width(rightSideTable.width - 50f).row()
.apply { setAlignment(Align.center) }
diplomacyTable.add(friendBonusLabel).row()
diplomacyTable.addSeparator()