From b6db8df48435866ea82f166b2c3684413306922a Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:59:34 +0200 Subject: [PATCH] Allow Space Key to close PlayerReadyScreen (#10155) --- .../unciv/ui/screens/worldscreen/PlayerReadyScreen.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt index c1d6801c8d..d1869cabaf 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt @@ -3,9 +3,11 @@ package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants -import com.unciv.ui.screens.basescreen.BaseScreen -import com.unciv.ui.components.input.onClick import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.input.KeyboardBinding +import com.unciv.ui.components.input.keyShortcuts +import com.unciv.ui.components.input.onActivation +import com.unciv.ui.screens.basescreen.BaseScreen class PlayerReadyScreen(worldScreen: WorldScreen) : BaseScreen() { init { @@ -19,9 +21,11 @@ class PlayerReadyScreen(worldScreen: WorldScreen) : BaseScreen() { table.add("[$curCiv] ready?".toLabel(curCiv.nation.getInnerColor(), Constants.headingFontSize)) - table.onClick { + table.onActivation { game.replaceCurrentScreen(worldScreen) } + // Doing this separately instead of passing the binding to onActivation avoids the tooltip + table.keyShortcuts.add(KeyboardBinding.NextTurnAlternate) table.setFillParent(true) stage.addActor(table) }