Merge branch 'OpenStarbound:main' into main

1 files changed, 15 insertions, 3 deletions

diff --git a/source/frontend/StarCharSelection.cpp b/source/frontend/StarCharSelection.cpp
index 6cbfb9b..2c00b42 100644
--- a/source/frontend/StarCharSelection.cpp
+++ b/source/frontend/StarCharSelection.cpp
@@ -37,8 +37,11 @@ CharSelectionPane::CharSelectionPane(PlayerStoragePtr playerStorage,
     updateCharacterPlates();
   });
   guiReader.registerCallback("clearSearch", [=](Widget*) {
-    auto searchCharacter = fetchChild<TextBoxWidget>("searchCharacter");
-    searchCharacter->setText("");
+    fetchChild<TextBoxWidget>("searchCharacter")->setText("");
+  });
+  guiReader.registerCallback("toggleDismissCheckbox", [=](Widget* widget) {
+    auto configuration = Root::singleton().configuration();
+    configuration->set("characterSwapDismisses", as<ButtonWidget>(widget)->isChecked());
   });
 
   guiReader.construct(root.assets()->json("/interface/windowconfig/charselection.config"), this);
@@ -63,6 +66,7 @@ void CharSelectionPane::show() {
   Pane::show();
 
   m_downScroll = 0;
+  fetchChild<TextBoxWidget>("searchCharacter")->setText("");
   updateCharacterPlates();
 }
 
@@ -96,14 +100,18 @@ void CharSelectionPane::updateCharacterPlates() {
     if (m_filteredList.size() > 0 && scrollPosition < m_filteredList.size()) {
       auto playerUuid = m_filteredList.get(scrollPosition);
       if (auto player = m_playerStorage->loadPlayer(playerUuid)) {
+        charSelector->show();
         player->humanoid()->setFacingDirection(Direction::Right);
         charSelector->setPlayer(player);
-        charSelector->enableDelete([this, playerUuid](Widget*) { m_deleteCallback(playerUuid); });
+        if (!m_readOnly)
+          charSelector->enableDelete([this, playerUuid](Widget*) { m_deleteCallback(playerUuid); });
         return;
       }
     }
     charSelector->setPlayer(PlayerPtr());
     charSelector->disableDelete();
+    if (m_readOnly)
+      charSelector->hide();
   };
 
   updatePlayerLine("charSelector1", m_downScroll + 0);
@@ -122,4 +130,8 @@ void CharSelectionPane::updateCharacterPlates() {
     fetchChild("playerDownButton")->hide();
 }
 
+void CharSelectionPane::setReadOnly(bool readOnly) {
+  findChild("createCharButton")->setVisibility(!(m_readOnly = readOnly));
+}
+
 }