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

Small fix - the Civilopedia link for buildings from CityScreen lower right had regressed (#7030)

Browse Source
This commit is contained in:
SomeTroglodyte 2022-05-31 22:58:11 +02:00 committed by GitHub
parent 98d189384c
commit 8e5a9a3385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt
View File

@ -8,7 +8,7 @@ import com.unciv.UncivGame
import com.unciv.logic.city.IConstruction import com.unciv.logic.city.IConstruction
import com.unciv.logic.city.PerpetualConstruction import com.unciv.logic.city.PerpetualConstruction
import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.RulesetObject import com.unciv.models.ruleset.IRulesetObject
import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.CivilopediaScreen import com.unciv.ui.civilopedia.CivilopediaScreen
@ -17,7 +17,6 @@ import com.unciv.ui.utils.*
class ConstructionInfoTable(val cityScreen: CityScreen): Table() { class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
private val selectedConstructionTable = Table() private val selectedConstructionTable = Table()
val city = cityScreen.city
init { init {
selectedConstructionTable.background = ImageGetter.getBackground(ImageGetter.getBlue().darken(0.5f)) selectedConstructionTable.background = ImageGetter.getBackground(ImageGetter.getBlue().darken(0.5f))
@ -26,7 +25,7 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
} }
fun update(selectedConstruction: IConstruction?) { fun update(selectedConstruction: IConstruction?) {
selectedConstructionTable.clear() selectedConstructionTable.clear() // clears content and listeners
if (selectedConstruction == null) { if (selectedConstruction == null) {
isVisible = false isVisible = false
@ -40,6 +39,7 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
} }
private fun updateSelectedConstructionTable(construction: IConstruction) { private fun updateSelectedConstructionTable(construction: IConstruction) {
val city = cityScreen.city
val cityConstructions = city.cityConstructions val cityConstructions = city.cityConstructions
//val selectedConstructionTable = Table() //val selectedConstructionTable = Table()
@ -68,8 +68,7 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
descriptionLabel.wrap = true descriptionLabel.wrap = true
add(descriptionLabel).colspan(2).width(stage.width / 4) add(descriptionLabel).colspan(2).width(stage.width / 4)
clearListeners() val link = (construction as? IRulesetObject)?.makeLink() ?: return
val link = (construction as? RulesetObject)?.makeLink() ?: return
if (link.isEmpty()) return if (link.isEmpty()) return
touchable = Touchable.enabled touchable = Touchable.enabled
onClick { onClick {