update ready

Author: TheSillyDoggo

src/Labels/Nodes/ImageNode.cpp

@@ -10,6 +10,14 @@ void ImageNode::labelConfigUpdated()
 
     sprite = CCSprite::create(config.imageLocation.c_str());
 
+    #if GEODE_COMP_GD_VERSION >= 22081
+    if (sprite && sprite->isUsingFallback())
+        sprite = nullptr;
+    #endif
+
+    if (sprite && sprite->getUserObject("geode.texture-loader/fallback"))
+        sprite = nullptr;
+
     if (!sprite)
     {
         sprite = CCSprite::create("sog.png"_spr);

src/Labels/Nodes/LabelContainerLayer.cpp

@@ -115,14 +115,16 @@ void LabelContainerLayer::sortNodeChildren(CCNode* node)
 
         n->setPositionX(bb.size.width * modX);
 
+        float yInc = n->boundingBox().size.height;
+
         if (node->getAnchorPoint().y == 0)
-            n->setPositionY(y - (height * node->getAnchorPoint().y));
+            n->setPositionY(y - (height * node->getAnchorPoint().y) + yInc / 2);
         else if (node->getAnchorPoint().y == 0.5f)
-            n->setPositionY((height / 2) - y);
+            n->setPositionY((height / 2) - y - yInc / 2);
         else
-            n->setPositionY(-y);
+            n->setPositionY(-y - yInc / 2);
 
-        y += n->boundingBox().size.height;
+        y += yInc;
     }
 }
 

src/Labels/UI/SetupLabelConfigUI.cpp

@@ -208,6 +208,13 @@ void SetupLabelConfigUI::createPage1()
     opacityLine->setRotation(90);
     opacityLine->setScaleY(0.9f);
 
+    auto rotationTitle = CCLabelBMFont::create("Rotation", "bigFont.fnt");
+    rotationTitle->setScale(0.5f);
+
+    auto rotationLine = CCSprite::createWithSpriteFrameName("edit_vLine_001.png");
+    rotationLine->setRotation(90);
+    rotationLine->setScaleY(0.9f);
+
     nameInp = TextInput::create(145, "Display Name", "bigFont.fnt");
     nameInp->setScale(0.7f);
     nameInp->setCommonFilter(CommonFilter::Any);
@@ -260,6 +267,8 @@ void SetupLabelConfigUI::createPage1()
     pages[0]->addChildAtPosition(scaleLine, Anchor::Left, ccp(20 + infoBG->getScaledContentWidth() / 2, 18 - 13));
     pages[0]->addChildAtPosition(opacityTitle, Anchor::Left, ccp(20 + infoBG->getScaledContentWidth() / 2, -38));
     pages[0]->addChildAtPosition(opacityLine, Anchor::Left, ccp(20 + infoBG->getScaledContentWidth() / 2, -38 - 13));
+    pages[0]->addChildAtPosition(rotationTitle, Anchor::Left, ccp(20 + infoBG->getScaledContentWidth() / 2, -38 - 56));
+    pages[0]->addChildAtPosition(rotationLine, Anchor::Left, ccp(20 + infoBG->getScaledContentWidth() / 2, -38 - 13 - 56));
 
     pages[0]->addChildAtPosition(generalBG, Anchor::Center, ccp(12.5f, 0));
     pages[0]->addChildAtPosition(fontBtn, Anchor::Center, ccp(12.5f, -65));
@@ -710,6 +719,9 @@ void SetupLabelConfigUI::updateImagePreview()
         imagePreview = nullptr;
     #endif
 
+    if (imagePreview && imagePreview->getUserObject("geode.texture-loader/fallback"))
+        imagePreview = nullptr;
+
     if (!imagePreview)
     {
         imagePreview = CCSprite::create("sog.png"_spr);