Fix scale control keybind and layer input in playtest

good night
HJfod · Feb 11, 2024 · 4897e60 · 4897e60
1 parent 998e516
commit 4897e60
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/features/Keybinds.cpp b/src/features/Keybinds.cpp
@@ -25,7 +25,9 @@ struct $modify(EditorUI) {
             this->transformObjectCall(EditCommand::RotateSnap);
         });
         this->defineKeybind("show-scale"_spr, [this]() {
-            this->activateScaleControl(nullptr);
+            if(auto scaleBtn = m_editButtonBar->m_buttonArray->objectAtIndex(m_editButtonBar->m_buttonArray->count() - 3)) {
+                this->activateScaleControl(scaleBtn);
+            }
         });
         this->defineKeybind("show-ui"_spr, [this]() {
             this->showUI(true);

diff --git a/src/features/TypeInZLayer.cpp b/src/features/TypeInZLayer.cpp
@@ -1,5 +1,6 @@
 
 #include <Geode/modify/EditorUI.hpp>
+#include <Geode/modify/CCTextInputNode.hpp>
 #include <utils/EditableBMLabelProxy.hpp>
 
 using namespace geode::prelude;
@@ -23,4 +24,15 @@ class $modify(EditorUI) {
 
         return true;
     }
-};
+
+    void showUI(bool toggle) {
+        EditorUI::showUI(toggle);
+
+        // playtest no ui option
+        if(!GameManager::sharedState()->getGameVariable("0046")) {
+            toggle = true;
+        }
+
+        m_currentLayerLabel->setVisible(toggle);
+    }
+};