From 049d5d5795ee492268d8ee680e17f2874a2b12e9 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Fri, 22 Aug 2025 12:42:06 +0300 Subject: [PATCH] Resolved #13844 - Removed city icons in unit overview --- .../ui/screens/overviewscreen/UnitOverviewTabColumn.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTabColumn.kt b/core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTabColumn.kt index 29b34f79c0..bd511811c8 100644 --- a/core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTabColumn.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTabColumn.kt @@ -64,7 +64,7 @@ enum class UnitOverviewTabColumn( }, 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) { @@ -83,7 +83,7 @@ enum class UnitOverviewTabColumn( ClosestCity("Closest city") { //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? { val closestCityTile = getClosestCityTile(item) ?: return null @@ -142,7 +142,7 @@ enum class UnitOverviewTabColumn( override fun getHeaderActor(iconSize: Float) = (headerLabel ?: name).toLabel() @Readonly override fun getEntryValue(item: MapUnit) = 0 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() // 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" }