From a24335abeadb3aa5fd2097ccab070236031e4211 Mon Sep 17 00:00:00 2001 From: Federico Luongo Date: Sat, 17 Oct 2020 21:07:48 +0200 Subject: [PATCH] Diplomacy Screen right table is scrollable (#3260) * Diplomacy Screen right table is scrollable * Scrollable city-state table * Resized to fit lower resolution * Fix right table width --- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index f7cce17c9d..af52bcc5ce 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -82,7 +82,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { fun updateRightSide(otherCiv: CivilizationInfo) { rightSideTable.clear() - if (otherCiv.isCityState()) rightSideTable.add(getCityStateDiplomacyTable(otherCiv)) + if (otherCiv.isCityState()) rightSideTable.add(ScrollPane(getCityStateDiplomacyTable(otherCiv))) else rightSideTable.add(ScrollPane(getMajorCivDiplomacyTable(otherCiv))).height(stage.height) } @@ -97,7 +97,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { private fun getCityStateDiplomacyTable(otherCiv: CivilizationInfo): Table { val otherCivDiplomacyManager = otherCiv.getDiplomacyManager(viewingCiv) - val diplomacyTable = Table() + val diplomacyTable = Table().apply { width = this@DiplomacyScreen.stage.width - leftSideTable.width } 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) - diplomacyTable.add(friendBonusLabel).row() - + .apply { setWrap(true); setAlignment(Align.center) } + diplomacyTable.add(friendBonusLabel).width(rightSideTable.width - 50f).row() diplomacyTable.addSeparator() @@ -196,7 +196,8 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { val description = assignedQuest.getDescription() questTable.add(title.toLabel(fontSize = 24)).row() - questTable.add(description.toLabel()).row() + questTable.add(description.toLabel().apply { setWrap(true); setAlignment(Align.center) }) + .width(rightSideTable.width - 50f).row() if (quest.duration > 0) questTable.add("[${remainingTurns}] turns remaining".toLabel()).row()