mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-25 23:29:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Show name when icon is tapped in resource overview in a label above the icon. (#1817)

Browse Source
This commit is contained in:
ltrcao
2020-02-01 10:31:12 -08:00
committed by GitHub
parent 261c3d6ced
commit 0914750489
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,8 +378,38 @@ class EmpireOverviewScreen(val viewingPlayer:CivilizationInfo) : CameraStageBase
val resources = resourceDrilldown.map { it.resource }
.filter { it.resourceType!=ResourceType.Bonus }.distinct().sortedBy { it.resourceType }
for(resource in resources)
resourcesTable.add(ImageGetter.getResourceImage(resource.name,50f))
var visibleLabel: Label? = null
for(resource in resources) {
// Create a group of label and icon for each resource.
val resourceImage = ImageGetter.getResourceImage(resource.name,50f)
val resourceLabel = resource.name.toLabel()
val labelPadding = 10f
// Using a table here leads to spacing issues
// due to different label lengths.
val holder = Group()
resourceImage.onClick {
if (visibleLabel != null)
visibleLabel!!.setVisible(false)
resourceLabel.setVisible(true)
visibleLabel = resourceLabel
}
holder.addActor(resourceImage)
holder.addActor(resourceLabel)
holder.setSize(resourceImage.getWidth(),
resourceImage.getHeight() + resourceLabel.getHeight() + labelPadding)
// Center-align all labels, but right-align the last couple resources' labels
// because they may get clipped otherwise. The leftmost label should be fine
// center-aligned (if there are more than 2 resources), because the left side
// has more padding.
val alignFactor = when {
(resources.indexOf(resource) + 2 >= resources.count()) -> 1
else -> 2
}
resourceLabel.moveBy((resourceImage.getWidth() - resourceLabel.getWidth()) / alignFactor,
resourceImage.getHeight() + labelPadding)
resourceLabel.setVisible(false)
resourcesTable.add(holder)
}
resourcesTable.addSeparator()
val origins = resourceDrilldown.map { it.origin }.distinct()