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

Resolved #9391 - clicking locally-added mods no longer crashes

Browse Source
This commit is contained in:
Yair Morgenstern 2023-05-15 09:22:15 +03:00
parent 6d185ea5a5
commit 7f4b7bbd21
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt
View File

@ -365,7 +365,7 @@ class ModManagementScreen(
) )
} }
val repoUrlToPreviewImage = HashMap<String, Texture?>() private val repoUrlToPreviewImage = HashMap<String, Texture?>()
private fun addModInfoToActionTable( private fun addModInfoToActionTable(
repoUrl: String, repoUrl: String,
@ -380,36 +380,7 @@ class ModManagementScreen(
val imageHolder = Table() val imageHolder = Table()
fun setTextureAsPreview(texture: Texture){ addPreviewImage(imageHolder, repoUrl, default_branch)
val maxAllowedImageSize = 200f
val cell = imageHolder.add(Image(texture))
val largestImageSize = max(texture.width, texture.height)
if (largestImageSize > maxAllowedImageSize) {
val resizeRatio = maxAllowedImageSize / largestImageSize
cell.size(texture.width * resizeRatio, texture.height * resizeRatio)
}
}
if (!repoUrlToPreviewImage.containsKey(repoUrl)) {
Concurrency.run {
val imagePixmap = Github.tryGetPreviewImage(repoUrl, default_branch)
if (imagePixmap == null) {
repoUrlToPreviewImage[repoUrl] = null
return@run
}
Concurrency.runOnGLThread {
val texture = Texture(imagePixmap)
imagePixmap.dispose()
repoUrlToPreviewImage[repoUrl] = texture
setTextureAsPreview(texture)
}
}
}
else {
val texture = repoUrlToPreviewImage[repoUrl]
if (texture!=null) setTextureAsPreview(texture)
}
modActionTable.add(imageHolder).row() modActionTable.add(imageHolder).row()
@ -438,6 +409,45 @@ class ModManagementScreen(
} }
} }
private fun addPreviewImage(
imageHolder: Table,
repoUrl: String,
default_branch: String
) {
if (!repoUrl.startsWith("http")) return // invalid url
fun setTextureAsPreview(texture: Texture) {
val maxAllowedImageSize = 200f
val cell = imageHolder.add(Image(texture))
val largestImageSize = max(texture.width, texture.height)
if (largestImageSize > maxAllowedImageSize) {
val resizeRatio = maxAllowedImageSize / largestImageSize
cell.size(texture.width * resizeRatio, texture.height * resizeRatio)
}
}
if (repoUrlToPreviewImage.containsKey(repoUrl)) {
val texture = repoUrlToPreviewImage[repoUrl]
if (texture != null) setTextureAsPreview(texture)
return
}
Concurrency.run {
val imagePixmap = Github.tryGetPreviewImage(repoUrl, default_branch)
if (imagePixmap == null) {
repoUrlToPreviewImage[repoUrl] = null
return@run
}
Concurrency.runOnGLThread {
val texture = Texture(imagePixmap)
imagePixmap.dispose()
repoUrlToPreviewImage[repoUrl] = texture
setTextureAsPreview(texture)
}
}
}
/** Create the special "Download from URL" button */ /** Create the special "Download from URL" button */
private fun getDownloadFromUrlButton(): TextButton { private fun getDownloadFromUrlButton(): TextButton {
val downloadButton = "Download mod from URL".toTextButton() val downloadButton = "Download mod from URL".toTextButton()