AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tweak UncivSlider and make the one on NewGameScreen permanently show the value tip (#4728)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-08-02 18:01:08 +02:00 committed by GitHub
parent 1ac10813bc
commit e7bf1fad7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,9 +96,10 @@ class GameOptionsTable(
val slider = UncivSlider(0f,numberOfCityStates.toFloat(),1f) { val slider = UncivSlider(0f,numberOfCityStates.toFloat(),1f) {
gameParameters.numberOfCityStates = it.toInt() gameParameters.numberOfCityStates = it.toInt()
} }
slider.value = gameParameters.numberOfCityStates.toFloat() slider.permanentTip = true
slider.isDisabled = locked slider.isDisabled = locked
add(slider).row() add(slider).padTop(10f).row()
slider.value = gameParameters.numberOfCityStates.toFloat()
} }
private fun Table.addSelectBox(text: String, values: Collection<String>, initialState: String, onChange: (newValue: String) -> Unit) { private fun Table.addSelectBox(text: String, values: Collection<String>, initialState: String, onChange: (newValue: String) -> Unit) {

8
core/src/com/unciv/ui/utils/UncivSlider.kt
View File

@ -81,7 +81,9 @@ class UncivSlider (
// Value tip format // Value tip format
var tipFormat = "%.1f" var tipFormat = "%.1f"
var permanentTip = false
// Detect changes in isDragging // Detect changes in isDragging
private var hasFocus = false private var hasFocus = false
@ -153,7 +155,8 @@ class UncivSlider (
tipLabel.setText(getTipText!!(slider.value)) tipLabel.setText(getTipText!!(slider.value))
if (!tipHideTask.isScheduled) showTip() if (!tipHideTask.isScheduled) showTip()
tipHideTask.cancel() tipHideTask.cancel()
Timer.schedule(tipHideTask, hideDelay) if (!permanentTip)
Timer.schedule(tipHideTask, hideDelay)
val enableMinus = slider.value > slider.minValue val enableMinus = slider.value > slider.minValue
minusButton?.touchable = if(enableMinus) Touchable.enabled else Touchable.disabled minusButton?.touchable = if(enableMinus) Touchable.enabled else Touchable.disabled
@ -210,6 +213,7 @@ class UncivSlider (
private fun showTip() { private fun showTip() {
if (tipContainer.hasParent()) return if (tipContainer.hasParent()) return
tipContainer.pack() tipContainer.pack()
if (needsLayout()) pack()
val pos = slider.localToParentCoordinates(Vector2(slider.width / 2, slider.height)) val pos = slider.localToParentCoordinates(Vector2(slider.width / 2, slider.height))
tipContainer.run { tipContainer.run {
setOrigin(Align.bottom) setOrigin(Align.bottom)