mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 13:49:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add civ names under their icon in diplomacy screen (#7240)

Browse Source
This commit is contained in:
alexban011
2022-07-04 18:26:30 +03:00
committed by GitHub
parent 9477b319bc
commit 4f97c239b4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import com.unciv.ui.tilegroups.CityButton
import com.unciv.ui.utils.BaseScreen import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.Fonts import com.unciv.ui.utils.Fonts
import com.unciv.ui.utils.KeyCharAndCode import com.unciv.ui.utils.KeyCharAndCode
import com.unciv.ui.utils.RecreateOnResize
import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip
import com.unciv.ui.utils.extensions.addSeparator import com.unciv.ui.utils.extensions.addSeparator
import com.unciv.ui.utils.extensions.disable import com.unciv.ui.utils.extensions.disable
@ -62,9 +63,9 @@ import com.unciv.ui.utils.AutoScrollPane as ScrollPane
@Suppress("KDocUnresolvedReference") // Mentioning non-field parameters is flagged, but they work anyway @Suppress("KDocUnresolvedReference") // Mentioning non-field parameters is flagged, but they work anyway
class DiplomacyScreen( class DiplomacyScreen(
val viewingCiv: CivilizationInfo, val viewingCiv: CivilizationInfo,
selectCiv: CivilizationInfo? = null, private val selectCiv: CivilizationInfo? = null,
selectTrade: Trade? = null private val selectTrade: Trade? = null
): BaseScreen() { ): BaseScreen(), RecreateOnResize {
companion object { companion object {
private const val nationIconSize = 100f private const val nationIconSize = 100f
private const val nationIconPad = 10f private const val nationIconPad = 10f
@ -152,9 +153,12 @@ class DiplomacyScreen(
questIcon.x = floor(civIndicator.width - questIcon.width) questIcon.x = floor(civIndicator.width - questIcon.width)
} }
val civNameLabel = civ.civName.toLabel()
leftSideTable.add(civIndicator).row() leftSideTable.add(civIndicator).row()
leftSideTable.add(civNameLabel).padBottom(20f).row()
civIndicator.onClick { updateRightSide(civ) } civIndicator.onClick { updateRightSide(civ) }
civNameLabel.onClick { updateRightSide(civ) }
} }
if (selectCivY != 0f) { if (selectCivY != 0f) {
@ -1008,4 +1012,6 @@ class DiplomacyScreen(
super.resize(width, height) super.resize(width, height)
positionCloseButton() positionCloseButton()
} }
override fun recreate(): BaseScreen = DiplomacyScreen(viewingCiv, selectCiv, selectTrade)
} }