Bug fixes

Author: Alphalaneous

assets/logo.ico

@@ -3,7 +3,7 @@
 	"gd": {
 		"win": "2.206"
 	},
-	"version": "v0.7.1",
+	"version": "v0.7.2",
 	"id": "zalphalaneous.minecraft",
 	"name": "Minecraftify!",
 	"developer": "Alphalaneous",

mod.json

@@ -4,18 +4,6 @@
 
 class $modify(MyCCDirector, CCDirector){
 
-	/*void popScene(){
-		CCScene* currentScene = CCDirector::get()->getRunningScene();
-		if(!currentScene->getChildByIDRecursive("settings-layer"_spr)){
-			if(!currentScene->getChildByIDRecursive("MenuLayer")){
-				CCDirector::popScene();
-			}
-		}
-		else{
-			currentScene->getChildByIDRecursive("settings-layer"_spr)->removeFromParent();
-		}
-	}*/
-
 	bool replaceScene(CCScene *pScene){
 
 		if(!GlobalVars::getSharedInstance()->isInitialLaunch){

src/ui/hooks/CCDirector.h

@@ -12,13 +12,24 @@ class $modify(MyFLAlertLayer, FLAlertLayer){
 		if(!Loader::get()->isModLoaded("geode.node-ids")) return true;
 
         CCNode* mainLayer = getChildByID("main-layer");
+        
+        bool hasScroll = mainLayer->getChildByID("scroll-layer");
 
         float scale = CCDirector::sharedDirector()->getContentScaleFactor()/4;
 
         if(CCScale9Sprite* background = typeinfo_cast<CCScale9Sprite*>(mainLayer->getChildByID("background"))){
             CCScale9Sprite* newBackground = CCScale9Sprite::create("ui_background.png"_spr);
             newBackground->setColor(background->getColor());
-            newBackground->setContentSize(background->getContentSize() / 4 / scale);
+
+            CCSize newBGSize = background->getContentSize() / 4 / scale;
+
+            float sizeIncrease = 0;
+
+            if(!hasScroll){
+                sizeIncrease = 10;
+            }
+
+            newBackground->setContentSize({newBGSize.width + sizeIncrease, newBGSize.height});
             newBackground->setScale(background->getScale() * 4 * scale);
             newBackground->setPosition({mainLayer->getContentSize().width/2, mainLayer->getContentSize().height/2});
             newBackground->setAnchorPoint(background->getAnchorPoint());
@@ -60,6 +71,9 @@ class $modify(MyFLAlertLayer, FLAlertLayer){
                 text->setAnchorPoint({0.5, 0});
                 text->setScale(0.6f);
                 text->setPosition({0, text->getPosition().y});
+                std::string labelText = std::string(text->getString());
+                Utils::trim(labelText);
+                text->setString(labelText.c_str());
             }
         }
 
@@ -77,6 +91,9 @@ class $modify(MyFLAlertLayer, FLAlertLayer){
                         text->setAnchorPoint({0.5, 1});
                         text->setScale(0.6f);
                         text->setPosition({0, text->getPosition().y});
+                        std::string labelText = std::string(text->getString());
+                        Utils::trim(labelText);
+                        text->setString(labelText.c_str());
                     }
 
                     contentLayer->setContentSize(textArea->getScaledContentSize());
@@ -120,7 +137,7 @@ class $modify(MyFLAlertLayer, FLAlertLayer){
             RowLayout* rowLayout = RowLayout::create();
             rowLayout->ignoreInvisibleChildren(true);
 
-            CCMenu* innerButtonMenu = CCMenu::create();
+            CCNode* innerButtonMenu = CCNode::create();
 
             innerButtonMenu->setContentSize({400, 30});
             innerButtonMenu->setLayout(rowLayout);

src/ui/hooks/FLAlertLayer.h

@@ -2,6 +2,8 @@
 #include "MCLabel.h"
 #include "../../utils/Utils.h"
 
+using namespace geode::prelude;
+
 CCSprite* generateEdgeSprite(gd::string textureName){
 
     float scale = CCDirector::sharedDirector()->getContentScaleFactor()/4;
@@ -133,7 +135,9 @@ void MCButtonChild::onHoverExit(){
 void MCButtonChild::selected(){
     if(this->isHovering){
         FMODAudioEngine::sharedEngine()->playEffect("click.ogg"_spr);
-        CCMenuItem::activate();
+        geode::Loader::get()->queueInMainThread([this]() { //delay it by a frame because for some reason it crashes the touch dispatcher otherwise ???
+            (m_pListener->*m_pfnSelector)(this);
+        });
     }
 }
 

src/ui/nodes/MCButtonChild.cpp

@@ -297,6 +297,11 @@ class Utils {
         return newToggler;
     }
 
+    static void trim(std::string& str) {
+        str.erase(str.find_last_not_of(' ')+1);   
+        str.erase(0, str.find_first_not_of(' '));
+    }
+
     static CCNode* getNodeSafe(CCNode* node, std::string id) {
 
         if(CCNode* ret = node->getChildByIDRecursive(id)){