mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 07:16:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Slider tip permanent by default (#8711)

Browse Source
This commit is contained in:
Gualdimar 2023-02-20 15:07:30 +02:00 committed by GitHub
parent 2530039c80
commit f99c322319
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/ui/components/UncivSlider.kt
View File

@ -54,6 +54,7 @@ class UncivSlider (
plusMinus: Boolean = true,
initial: Float,
sound: UncivSound = UncivSound.Slider,
private var permanentTip: Boolean = true,
private val getTipText: ((Float) -> String)? = null,
onChange: ((Float) -> Unit)? = null
): Table(BaseScreen.skin) {
@ -76,7 +77,11 @@ class UncivSlider (
private val plusButton: IconCircleGroup?
private val tipLabel = "".toLabel(Color.LIGHT_GRAY)
private val tipContainer: Container<Label> = Container(tipLabel)
private val tipHideTask: Timer.Task
private val tipHideTask = object : Timer.Task() {
override fun run() {
hideTip()
}
}
// copies of maliciously protected Slider members
private var snapToValues: FloatArray? = null
@ -126,20 +131,17 @@ class UncivSlider (
// java format string for the value tip, set by changing stepSize
private var tipFormat = "%.1f"
/** Prevents hiding the value tooltip over the slider knob */
var permanentTip = false
// Detect changes in isDragging
private var hasFocus = false
init {
tipLabel.setOrigin(Align.center)
tipContainer.touchable = Touchable.disabled
tipHideTask = object : Timer.Task() {
override fun run() {
hideTip()
}
}
/** Prevents hiding the value tooltip over the slider knob */
if(permanentTip)
tipHideTask.cancel()
stepChanged() // Initialize tip formatting

2
core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditTab.kt
View File

@ -90,7 +90,7 @@ class MapEditorEditTab(
defaults().pad(10f).left()
add(brushLabel)
brushCell = add().padLeft(0f)
brushSlider = UncivSlider(1f,6f,1f, initial = 1f, getTipText = { getBrushTip(it).tr() }) {
brushSlider = UncivSlider(1f,6f,1f, initial = 1f, getTipText = { getBrushTip(it).tr() }, permanentTip = false) {
brushSize = if (it > 5f) -1 else it.toInt()
brushLabel.setText("Brush ([${getBrushTip(it, true)}]):".tr())
}

6
core/src/com/unciv/ui/screens/newgamescreen/GameOptionsTable.kt
View File

@ -229,7 +229,6 @@ class GameOptionsTable(
val slider = UncivSlider(2f, playableAvailable.toFloat(), 1f, initial = gameParameters.minNumberOfPlayers.toFloat()) {
gameParameters.minNumberOfPlayers = it.toInt()
}
slider.permanentTip = true
slider.isDisabled = locked
add(slider).padTop(10f).row()
}
@ -242,7 +241,6 @@ class GameOptionsTable(
val slider = UncivSlider(2f, playableAvailable.toFloat(), 1f, initial = gameParameters.maxNumberOfPlayers.toFloat()) {
gameParameters.maxNumberOfPlayers = it.toInt()
}
slider.permanentTip = true
slider.isDisabled = locked
add(slider).padTop(10f).row()
}
@ -255,7 +253,6 @@ class GameOptionsTable(
val slider = UncivSlider(0f, cityStatesAvailable.toFloat(), 1f, initial = gameParameters.minNumberOfCityStates.toFloat()) {
gameParameters.minNumberOfCityStates = it.toInt()
}
slider.permanentTip = true
slider.isDisabled = locked
add(slider).padTop(10f).row()
}
@ -268,7 +265,6 @@ class GameOptionsTable(
val slider = UncivSlider(0f, cityStatesAvailable.toFloat(), 1f, initial = gameParameters.maxNumberOfCityStates.toFloat()) {
gameParameters.maxNumberOfCityStates = it.toInt()
}
slider.permanentTip = true
slider.isDisabled = locked
add(slider).padTop(10f).row()
}
@ -281,7 +277,6 @@ class GameOptionsTable(
val slider = UncivSlider(0f, cityStatesAvailable.toFloat(), 1f, initial = gameParameters.numberOfCityStates.toFloat()) {
gameParameters.numberOfCityStates = it.toInt()
}
slider.permanentTip = true
slider.isDisabled = locked
add(slider).padTop(10f).row()
}
@ -294,7 +289,6 @@ class GameOptionsTable(
val slider = UncivSlider(250f, 1500f, 50f, initial = gameParameters.maxTurns.toFloat()) {
gameParameters.maxTurns = it.toInt()
}
slider.permanentTip = true
slider.isDisabled = locked
val snapValues = floatArrayOf(250f,300f,350f,400f,450f,500f,550f,600f,650f,700f,750f,800f,900f,1000f,1250f,1500f)
slider.setSnapToValues(snapValues, 250f)