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

Next turn button reactivates after closing a popup menu (#11267)

Browse Source
This commit is contained in:
Oskar Niesen 2024-03-09 15:05:39 -06:00 committed by GitHub
parent 41b29256fe
commit b10ed5ff87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/ui/screens/worldscreen/status/AutoPlayMenu.kt
View File

@ -22,6 +22,11 @@ class AutoPlayMenu(
) : AnimatedMenuPopup(stage, getActorTopRight(positionNextTo)) {
private val settings = GUI.getSettings()
init {
// We need to activate the end turn button again after the menu closes
afterCloseCallback = { worldScreen.shouldUpdate = true }
}
override fun createContentTable(): Table {
val table = super.createContentTable()!!
// Using the same keyboard binding for bypassing this menu and the default option

6
core/src/com/unciv/ui/screens/worldscreen/status/NextTurnMenu.kt
View File

@ -13,6 +13,12 @@ class NextTurnMenu(
private val nextTurnButton: NextTurnButton,
private val worldScreen: WorldScreen
) : AnimatedMenuPopup(stage, getActorTopRight(positionNextTo)) {
init {
// We need to activate the end turn button again after the menu closes
afterCloseCallback = { worldScreen.shouldUpdate = true }
}
override fun createContentTable(): Table {
val table = super.createContentTable()!!
table.add(getButton("Next Turn", KeyboardBinding.NextTurnMenuNextTurn) {