From 065fce6a979ba53e5cbaf24c472cbf67cb98f435 Mon Sep 17 00:00:00 2001 From: alexban011 Date: Thu, 12 Jan 2023 14:26:58 +0200 Subject: [PATCH] Fixed some warnings (#8362) * fix 2 warnings * circleImageLocation not used * isWorldScreen removed NOTE: this parameter isn't used but TechButton.kt:72 does sent it --- core/src/com/unciv/ui/pickerscreens/TechButton.kt | 4 ++-- core/src/com/unciv/ui/utils/TabbedPager.kt | 4 ++-- core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/pickerscreens/TechButton.kt index 5ac4a4888f..5a3d3bb5d4 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechButton.kt @@ -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", diff --git a/core/src/com/unciv/ui/utils/TabbedPager.kt b/core/src/com/unciv/ui/utils/TabbedPager.kt index caa087f124..60ee972b35 100644 --- a/core/src/com/unciv/ui/utils/TabbedPager.kt +++ b/core/src/com/unciv/ui/utils/TabbedPager.kt @@ -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 diff --git a/core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt b/core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt index 058007ddd0..f154cd3ca5 100644 --- a/core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt +++ b/core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt @@ -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)