cccczxcz

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "4.1.0",
-	"version": "v1.7.6",
+	"version": "v1.7.7",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",

src/Client/Windows/Labels.cpp

@@ -292,10 +292,30 @@ void Labels::refreshList()
             bg->setContentSize(bg->getContentSize() * 2.5f);
             bg->setPositionX(4);
 
-            auto name = CCLabelBMFont::create(module->name.c_str(), "bigFont.fnt");
-            name->setAnchorPoint(ccp(0, 0.5f));
-            name->setPosition(ccp(10, cell->getContentHeight() / 2));
-            name->limitLabelWidth(95, 0.4f, 0);
+            auto nameBack = CCScale9Sprite::create("square02_small.png");
+            nameBack->setOpacity(100);
+            nameBack->setContentSize(ccp(120, 18) * 3);
+            nameBack->setAnchorPoint(ccp(0, 0.5f));
+            nameBack->setScale(1.0f / 3.0f);
+            nameBack->setPositionX(6.5f);
+            nameBack->setPositionY(cell->getContentHeight() / 2);
+
+            auto nameInp = TextInput::create(160, "Display Name", "bigFont.fnt");
+            nameInp->setAnchorPoint(ccp(0, 0.5f));
+            nameInp->setPosition(ccp(10, cell->getContentHeight() / 2));
+            nameInp->setScale(0.7f);
+
+            nameInp->getBGSprite()->setVisible(false);
+            nameInp->getInputNode()->m_placeholderLabel->setAnchorPoint(ccp(0, 0.5f));
+            nameInp->getInputNode()->m_placeholderLabel->setPositionX(-nameInp->getContentWidth() / 2);
+
+            nameInp->setString(lbl->name);
+            nameInp->setCallback([this, lbl](const std::string& str)
+            {
+                lbl->name = str;
+
+                save();
+            });
 
             auto m = CCMenu::create();
             m->setPosition(ccp(0, 0));
@@ -397,7 +417,8 @@ void Labels::refreshList()
             m->addChild(toggleBtn);
 
             cell->addChild(bg);
-            cell->addChild(name);
+            cell->addChild(nameBack);
+            cell->addChild(nameInp);
             cell->addChild(m);
 
             scroll->m_contentLayer->addChild(cell);

src/UI/TransAlertLayer.cpp

@@ -11,7 +11,7 @@ bool TransAlertLayer::init(char const* title, const gd::string& desc, char const
 
     bool useTtf = false;
 
-    useTtf = !std::regex_match(desc2, std::regex("^[a-zA-Z0-9\\s%:-]*$"));
+    useTtf = !std::regex_match(desc2, std::regex(ENGLISH_REGEX));
 
     if (useTtf)
     {

src/UI/TransLabelBMFont.cpp

@@ -123,7 +123,7 @@ void TransLabelBMFont::updateTTFVisible()
     }
     else
     {
-        useTtf = !std::regex_match(text, std::regex("^[a-zA-Z0-9\\s%:-]*$"));
+        useTtf = !std::regex_match(text, std::regex(ENGLISH_REGEX));
     }
 
     label->setString(text.c_str());

src/UI/TransLabelBMFont.hpp

@@ -4,6 +4,8 @@
 
 using namespace geode::prelude;
 
+#define ENGLISH_REGEX "^[a-zA-Z0-9\\s%:-]*$"
+
 // they call this my gender
 class TransLabelBMFont : public CCNode
 {
@@ -28,9 +30,10 @@ class TransLabelBMFont : public CCNode
         CCLabelTTF* createTTF(std::string font, float fontSize);
         void updateTTFVisible();
 
+        ~TransLabelBMFont();
+
     public:
         bool init(std::string text, std::string font);
-        ~TransLabelBMFont();
 
         void limitLabelWidth(float width, float defaultScale, float minScale);