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

Fixed some warnings (#8362)

Browse Source 
* fix 2 warnings

* circleImageLocation not used

* isWorldScreen removed

NOTE: this parameter isn't used but TechButton.kt:72 does sent it
This commit is contained in:
alexban011
2023-01-12 14:26:58 +02:00
committed by GitHub
parent d605c41ae0
commit 065fce6a97
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -69,7 +69,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
rightSide.add(text).width(140f).top().left().padRight(15f)
rightSide.add(turns).width(40f).top().left().padRight(10f).row()
addTechEnabledIcons(techName, isWorldScreen, rightSide)
addTechEnabledIcons(techName, rightSide)
rightSide.centerY(this)
add(rightSide).expandX().left()
@ -87,7 +87,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
pack()
}
private fun addTechEnabledIcons(techName: String, isWorldScreen: Boolean, rightSide: Table) {
private fun addTechEnabledIcons(techName: String, rightSide: Table) {
val techEnabledIcons = Table().align(Align.left)
techEnabledIcons.background = BaseScreen.skinStrings.getUiBackground(
"TechPickerScreen/TechButtonIconsOutline",

4
core/src/com/unciv/ui/utils/TabbedPager.kt
View File

@ -129,8 +129,8 @@ open class TabbedPager(
name = caption // enable finding pages by untranslated caption without needing our own field
if (icon != null) {
if (iconSize != 0f)
iconCell!!.size(iconSize)
iconCell!!.padRight(pager.headerPadding * 0.5f)
iconCell.size(iconSize)
iconCell.padRight(pager.headerPadding * 0.5f)
}
}
var buttonX = 0f

2
core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt
View File

@ -311,7 +311,7 @@ fun Actor.onChange(function: (event: ChangeListener.ChangeEvent?) -> Unit): Acto
fun Actor.surroundWithCircle(size: Float, resizeActor: Boolean = true,
color: Color = Color.WHITE, circleImageLocation:String = "OtherIcons/Circle"): IconCircleGroup {
return IconCircleGroup(size, this, resizeActor, color)
return IconCircleGroup(size, this, resizeActor, color, circleImageLocation)
}
fun Actor.surroundWithThinCircle(color: Color=Color.BLACK): IconCircleGroup = surroundWithCircle(width+2f, false, color)