a

changelog.md

@@ -1,3 +1,8 @@
+# 1.6.8
+
+- Fixed checking for updates text being positioned wrong when the Loading Circle is visible
+- Fixed freeze when opening the font picker menu for the first time
+
 # 1.6.7
 
 - Fixed Speedhack not working with physics bypass enabled in cbf

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "3.7.1",
-	"version": "v1.6.7",
+	"version": "v1.6.8",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206",

src/Client/AndroidBall.cpp

@@ -12,7 +12,7 @@ bool AndroidBall::init()
 
     this->setID("QOLModButton"_spr);
     this->setMouseEnabled(false);
-    this->setTouchEnabled(true);
+    this->setTouchEnabled(false);
 
     highest++;
     this->setTag(highest);

src/Client/AndroidUI.cpp

@@ -221,6 +221,7 @@ void AndroidUI::updateVersionLabel()
 
         updateListener.setFilter(Mod::get()->checkUpdates());
 
+        versionParent->updateLayout();
         return;
     }
 
@@ -235,7 +236,6 @@ void AndroidUI::updateVersionLabel()
                 n->setColor(ccc3(87, 87, 255));
             }
         }
-
     }
 
     versionParent->updateLayout();

src/Layers/ChooseFontPopup.cpp

@@ -2,7 +2,7 @@
 
 void ChooseFontPopup::customSetup()
 {
-    // 59 being the custom song count
+    // 59 being the custom font count
     int fontCount = 59 + 3;
     float cellSize = 30;
 
@@ -69,9 +69,12 @@ void ChooseFontPopup::customSetup()
 
         toggles.push_back(btn);
 
-        auto lbl = CCLabelBMFont::create(name.c_str(), font.c_str());
+        auto lbl = ThreadedLabelBMFont::create(name.c_str(), font.c_str(), [this](ThreadedLabelBMFont* label)
+        {
+            label->getLabel()->setScale(20 / label->getLabel()->getContentHeight());
+        });
+
         lbl->setAnchorPoint(ccp(0, 0.5f));
-        lbl->setScale(20 / lbl->getContentHeight());
 
         cell->addChildAtPosition(menu, Anchor::Right, ccp(-17.5f, 0));
         cell->addChildAtPosition(lbl, Anchor::Left, ccp(6, 0));

src/Layers/ChooseFontPopup.hpp

@@ -3,6 +3,7 @@
 #include <Geode/Geode.hpp>
 #include "../Client/Module.h"
 #include "../Hacks/SafeMode/SafeMode.hpp"
+#include "../UI/ThreadedLabelBMFont.hpp"
 
 #include "SillyBaseLayer.h"
 

src/UI/ThreadedLabelBMFont.cpp

@@ -0,0 +1,104 @@
+#include "ThreadedLabelBMFont.hpp"
+
+bool ThreadedLabelBMFont::init(std::string text, std::string font, MiniFunction<void(ThreadedLabelBMFont*)> callback)
+{
+    if (!CCNode::init())
+        return false;
+
+    this->text = text;
+    this->font = font;
+    this->callback = callback;
+
+    if (CCTextureCache::get()->textureForKey(utils::string::replace(font, ".fnt", ".png").c_str()))
+    {
+        addLabel();
+    }
+    else
+    {
+        labels.push_back(this);
+        this->retain();
+
+        if (labels.size() - 1 == 0)
+        {
+            Loader::get()->queueInMainThread([this]
+            {
+                queueStep();
+            });
+        }
+    }
+
+    return true;
+}
+
+void ThreadedLabelBMFont::queueStep()
+{
+    if (labels.size() == 0)
+        return;
+
+    if (auto lbl = as<Ref<ThreadedLabelBMFont>>(labels[0]))
+    {
+        auto conf = FNTConfigLoadFile(lbl->font.c_str());
+
+        CCTextureCache::get()->addImage(conf->getAtlasName(), false);
+
+        auto fnt = lbl->font;
+
+        for (auto lbl : labels)
+        {
+            if (lbl->font == fnt)
+            {
+                lbl->addLabel();
+                lbl->release();
+            }
+        }
+
+        labels.erase(std::remove_if(labels.begin(), labels.end(), [fnt](ThreadedLabelBMFont* obj)
+        {
+            return obj->getFont() == fnt;
+        }));
+
+        if (labels.size() != 0)
+        {
+            Loader::get()->queueInMainThread([this]
+            {
+                queueStep();
+            });
+        }
+    }
+}
+
+void ThreadedLabelBMFont::addLabel()
+{
+    label = CCLabelBMFont::create(text.c_str(), font.c_str());
+    this->addChild(label);
+
+    if (callback)
+        callback(this);
+
+    this->setContentSize(label->getScaledContentSize());
+    label->setAnchorPoint(ccp(0, 0));
+}
+
+CCLabelBMFont* ThreadedLabelBMFont::getLabel()
+{
+    return label;
+}
+
+std::string ThreadedLabelBMFont::getFont()
+{
+    return font;
+}
+
+ThreadedLabelBMFont* ThreadedLabelBMFont::create(std::string text, std::string font, MiniFunction<void(ThreadedLabelBMFont*)> callback)
+{
+    auto pRet = new ThreadedLabelBMFont();
+
+    if (pRet && pRet->init(text, font, callback))
+    {
+        pRet->autorelease();
+        return pRet;
+    }
+
+    CC_SAFE_DELETE(pRet);
+    return nullptr;
+}

src/UI/ThreadedLabelBMFont.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+using namespace geode::prelude;
+
+class ThreadedLabelBMFont : public CCNode
+{
+    private:
+        CCLabelBMFont* label;
+        std::string text;
+        std::string font;
+        MiniFunction<void(ThreadedLabelBMFont*)> callback;
+
+        static inline std::vector<ThreadedLabelBMFont*> labels = {};
+
+        void addLabel();
+        void queueStep();
+
+    public:
+        CCLabelBMFont* getLabel();
+        std::string getFont();
+
+        bool init(std::string text, std::string font, MiniFunction<void(ThreadedLabelBMFont*)> callback);
+
+        // Callback is always run on main thread
+        static ThreadedLabelBMFont* create(std::string text, std::string font, MiniFunction<void(ThreadedLabelBMFont*)> callback = nullptr);
+};