From 299aa06d94c25d004c50594b9d63c6c7a234e585 Mon Sep 17 00:00:00 2001
From: Crsi <47722349+CrsiX@users.noreply.github.com>
Date: Sat, 6 May 2023 20:13:19 +0200
Subject: [PATCH] Close the friend selection popup in NewGameScreen by click
 outside or ESC/BACK key (#9329)

---
 .../com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt
index 7fe74f6b57..9d6d5acfc1 100644
--- a/core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt
+++ b/core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt
@@ -355,7 +355,8 @@ class FriendSelectionPopup(
         val friendList = FriendPickerList(playerPicker, ::friendSelected)
         pickerPane.topTable.add(friendList)
         pickerPane.rightSideButton.setText("Select friend".tr())
-        pickerPane.closeButton.onClick(::close)
+        pickerPane.closeButton.onActivation(::close)
+        pickerPane.closeButton.keyShortcuts.add(KeyCharAndCode.BACK)
         pickerCell.setActor<PickerPane>(pickerPane)
         pickerPane.rightSideButton.onClick {
             close()
@@ -366,6 +367,8 @@ class FriendSelectionPopup(
                 playerPicker.update()
             }
         }
+
+        clickBehindToClose = true
     }
 
     private fun friendSelected(friendName: String) {