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

Resolved #13844 - Removed city icons in unit overview

Browse Source
This commit is contained in:
yairm210 2025-08-22 12:42:06 +03:00
parent da85856fe3
commit 049d5d5795
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/screens/overviewscreen/UnitOverviewTabColumn.kt
View File

@ -64,7 +64,7 @@ enum class UnitOverviewTabColumn(
}, },
Action { Action {
override fun getEntryString(item: MapUnit): String? = getActionText(item) override fun getEntryString(item: MapUnit): String? = getActionText(item)?.tr() // to retain the icon for e.g. unit action
}, },
Strength(Fonts.strength.toString(), "Strength", true) { Strength(Fonts.strength.toString(), "Strength", true) {
@ -83,7 +83,7 @@ enum class UnitOverviewTabColumn(
ClosestCity("Closest city") { ClosestCity("Closest city") {
//todo these overrides call a getTilesInDistance(3).firstOrNull loop independently and possibly repeatedly - caching? //todo these overrides call a getTilesInDistance(3).firstOrNull loop independently and possibly repeatedly - caching?
override fun getEntryString(item: MapUnit) = getClosestCityTile(item)?.getCity()?.name override fun getEntryString(item: MapUnit) = getClosestCityTile(item)?.getCity()?.name?.tr(hideIcons = true)
override fun getEntryActor(item: MapUnit, iconSize: Float, actionContext: UnitOverviewTab): Actor? { override fun getEntryActor(item: MapUnit, iconSize: Float, actionContext: UnitOverviewTab): Actor? {
val closestCityTile = getClosestCityTile(item) ?: return null val closestCityTile = getClosestCityTile(item) ?: return null
@ -142,7 +142,7 @@ enum class UnitOverviewTabColumn(
override fun getHeaderActor(iconSize: Float) = (headerLabel ?: name).toLabel() override fun getHeaderActor(iconSize: Float) = (headerLabel ?: name).toLabel()
@Readonly override fun getEntryValue(item: MapUnit) = 0 @Readonly override fun getEntryValue(item: MapUnit) = 0
override fun getEntryActor(item: MapUnit, iconSize: Float, actionContext: UnitOverviewTab): Actor? = override fun getEntryActor(item: MapUnit, iconSize: Float, actionContext: UnitOverviewTab): Actor? =
getEntryString(item)?.toLabel(alignment = Align.center) getEntryString(item)?.toLabel(alignment = Align.center, hideIcons = true)
override fun getComparator() = if (isNumeric) super.getComparator() override fun getComparator() = if (isNumeric) super.getComparator()
// Sort empty cells to the end by faking a `String.MAX_VALUE` - to do it properly would be a far more verbose Comparator subclass // Sort empty cells to the end by faking a `String.MAX_VALUE` - to do it properly would be a far more verbose Comparator subclass
else compareBy(ISortableGridContentProvider.collator) { getEntryString(it)?.tr(hideIcons = true) ?: "\uD83D\uDE00zzz" } else compareBy(ISortableGridContentProvider.collator) { getEntryString(it)?.tr(hideIcons = true) ?: "\uD83D\uDE00zzz" }