From 05d246cdbe5919a1b8a5f2b7b241c6384f803347 Mon Sep 17 00:00:00 2001 From: itanasi <44038014+itanasi@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:32:31 -0800 Subject: [PATCH] Changes (#12846) --- core/src/com/unciv/ui/components/input/KeyboardBinding.kt | 2 +- .../com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt | 3 +-- core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/ui/components/input/KeyboardBinding.kt b/core/src/com/unciv/ui/components/input/KeyboardBinding.kt index cbe55aa0f58f2..623a50678afab 100644 --- a/core/src/com/unciv/ui/components/input/KeyboardBinding.kt +++ b/core/src/com/unciv/ui/components/input/KeyboardBinding.kt @@ -102,7 +102,7 @@ enum class KeyboardBinding( // Unit actions - name MUST correspond to UnitActionType.name because the shorthand constructor // there looks up bindings here by name - which also means we must not use UnitActionType // here as it will not be guaranteed to already be fully initialized. - SwapUnits(Category.UnitActions,"Swap units", 'y'), + SwapUnits(Category.UnitActions, "Swap units", 'y'), Automate(Category.UnitActions, 'm'), ConnectRoad(Category.UnitActions, "Connect road", 'c'), StopAutomation(Category.UnitActions,"Stop automation", 'm'), diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt index cf832013b18ae..b32feed24c6ea 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt @@ -33,8 +33,7 @@ class IdleUnitButton ( add(image).size(imageSize).pad(10f,20f) enable() keyShortcuts.add(keyShortcutBind) - addTooltip(keyShortcutBind) - onActivation { + onActivation (binding = keyShortcutBind) { val idleUnits = unitTable.worldScreen.viewingCiv.units.getIdleUnits() if (idleUnits.none()) return@onActivation diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt index e2274ebca6031..728c3d69cb8ad 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt @@ -28,8 +28,10 @@ import com.unciv.ui.screens.pickerscreens.UnitRenamePopup import com.unciv.ui.screens.worldscreen.WorldScreen class UnitTable(val worldScreen: WorldScreen) : Table() { - private val prevIdleUnitButton = IdleUnitButton(this,worldScreen.mapHolder,true, KeyboardBinding.PrevIdleButton) - private val nextIdleUnitButton = IdleUnitButton(this,worldScreen.mapHolder,false, KeyboardBinding.NextIdleButton) + private val prevIdleUnitButton = + IdleUnitButton(this, worldScreen.mapHolder, true, KeyboardBinding.PrevIdleButton) + private val nextIdleUnitButton = + IdleUnitButton(this, worldScreen.mapHolder, false, KeyboardBinding.NextIdleButton) private val unitIconHolder = Table() private val unitNameLabel = "".toLabel(fontSize = 24) private val unitIconNameGroup = Table()