7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 09:55:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 793f554cda into a31c68f178

Browse source
This commit is contained in:
Justin 2024-08-28 09:34:47 -04:00 committed by GitHub
commit ecc9965ac6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
loader/include/Geode/utils/cocos.hpp
View file

@ -713,6 +713,24 @@ namespace geode::cocos {
*/
GEODE_DLL void limitNodeSize(cocos2d::CCNode* node, cocos2d::CCSize const& size, float def, float min);
/**
* Rescale node to fit inside given width
* @param node Node to rescale
* @param width Width to fit inside
* @param def Default scale
* @param min Minimum scale
*/
GEODE_DLL void limitNodeWidth(cocos2d::CCNode* node, float width, float def, float min);
/**
* Rescale node to fit inside given height
* @param node Node to rescale
* @param height Height to fit inside
* @param def Default scale
* @param min Minimum scale
*/
GEODE_DLL void limitNodeHeight(cocos2d::CCNode* node, float height, float def, float min);
/**
* Checks if a node is visible (recursively
* checks parent visibility)

23
loader/src/ui/nodes/MDTextArea.cpp
View file

@ -334,6 +334,8 @@ struct MDParser {
}
float spriteScale = 1.0f;
float spriteWidth = 0.0f;
float spriteHeight = 0.0f;
for (auto [key, value] : imgArguments) {
if (key == "scale") {
@ -342,6 +344,18 @@ struct MDParser {
spriteScale = *scaleRes;
}
}
else if (key == "width") {
auto widthRes = utils::numFromString<float>(value);
if (widthRes) {
spriteWidth = *widthRes;
}
}
else if (key == "height") {
auto heightRes = utils::numFromString<float>(value);
if (heightRes) {
spriteHeight = *heightRes;
}
}
}
if (utils::string::startsWith(s_lastImage, "frame:")) {
@ -357,6 +371,15 @@ struct MDParser {
}
if (spr && spr->getUserObject("geode.texture-loader/fallback") == nullptr) {
spr->setScale(spriteScale);
if (spriteWidth > 0.0f && spriteHeight <= 0.0f) {
limitNodeWidth(spr, spriteWidth, 999.f, .1f);
}
else if (spriteHeight > 0.0f && spriteWidth <= 0.0f) {
limitNodeHeight(spr, spriteHeight, 999.f, .1f);
}
else if (spriteWidth > 0.0f && spriteHeight > 0.0f) {
limitNodeSize(spr, { spriteWidth, spriteHeight }, 999.f, .1f);
}
renderer->renderNode(spr);
}
else {

8
loader/src/utils/cocos.cpp
View file

@ -455,6 +455,14 @@ void geode::cocos::limitNodeSize(CCNode* spr, CCSize const& size, float def, flo
spr->setScale(clamp(std::min(size.height / spr->getContentHeight(), size.width / spr->getContentWidth()), min, def));
}
void geode::cocos::limitNodeWidth(CCNode* spr, float width, float def, float min) {
spr->setScale(clamp(width / spr->getContentSize().width, min, def));
}
void geode::cocos::limitNodeHeight(CCNode* spr, float height, float def, float min) {
spr->setScale(clamp(height / spr->getContentSize().height, min, def));
}
bool geode::cocos::nodeIsVisible(CCNode* node) {
if (!node->isVisible()) {
return false;