fix

Author: w-zz-w-zz-w

changelog.md

@@ -1,7 +1,7 @@
 # 2.5.3
 
 - Fixed minor UI issues
-- Fixed Floating buttons making screen black with textureldr installed
+- Added warning when using shortcuts with textureldr installed
 
 # 2.5.2
 

src/GUI/FloatingButton/FloatingUIManager.cpp

@@ -60,6 +60,11 @@ void FloatingUIManager::visit()
     if (!CCScene::get() || CCScene::get()->getChildByType<LoadingLayer>(0))
         return;
 
+    #ifdef GEODE_IS_MOBILE
+    if (Loader::get()->getLoadedMod("geode.texture-loader"))
+        return;
+    #endif
+
     sortButtons();
 
     return CCNode::visit();
@@ -87,6 +92,11 @@ bool FloatingUIManager::touches(CCSet *pTouches, CCEvent *pEvent, unsigned int u
     if (AndroidUI::get())
         return false;
 
+    #ifdef GEODE_IS_MOBILE
+    if (Loader::get()->getLoadedMod("geode.texture-loader"))
+        return;
+    #endif
+
     sortButtons();
     std::reverse(buttons.begin(), buttons.end());
 

src/GUI/FloatingButton/FloatingUIManager.hpp

@@ -11,6 +11,8 @@ class FloatingUIDrawHook : public cocos2d::CCNode
 
 class FloatingUIManager : public cocos2d::CCNode
 {
+    friend struct FloatingMenuLayer;
+
     protected:
         std::vector<FloatingUIButton*> buttons = {};
         FloatingUIButton* selected = nullptr;

src/GUI/FloatingButton/Hooks.cpp

@@ -6,7 +6,23 @@ bool FloatingMenuLayer::init()
 {
     FloatingUIManager::get()->updateSprites();
 
-    return MenuLayer::init();
+    MenuLayer::init();
+    
+    #ifdef GEODE_IS_MOBILE
+
+    if (Loader::get()->getLoadedMod("geode.texture-loader"))
+    {
+        if (FloatingUIManager::get()->buttons.size() > 0)
+        {
+            auto alert = FLAlertLayer::create("Shortcuts", "Shortcuts are currently not supported with textureldr installed\nsorry :c", "OK");
+            alert->m_scene = this;
+            alert->show();
+        }
+    }
+
+    #endif
+
+    return true;
 }
 
 void FloatingTouchDispatcher::touches(CCSet *pTouches, CCEvent *pEvent, unsigned int uIndex)