update suppporter info + fix infinite zooming on android

HJfod · HJfod · commit d338d337e9a6 · 2025-06-27T21:22:48.000+03:00
diff --git a/about.md b/about.md
@@ -22,6 +22,8 @@ Pre-2.206 versions of BetterEdit relied on the now-defunct BetterSave mod to cre
 
 ## <cy>Support</c>
 
-BetterEdit is first and foremost **a passion project**, however it is also being developed by a poor student living on his own. If you would like to support development and help me out, I have a <cp>Ko-fi</c>! Supporters get <co>Early Access</c> to features. I also plan on adding extra advanced features for Supporters in the future!
+BetterEdit is first and foremost <cy>a passion project</c>, but if you would like to support development, I have a Ko-fi!
+
+Supporters used to get exclusive features, but those features have since been made free for everyone. Feel free to donate if you want to thank me for my work on BetterEdit and Geode, but be aware that it'll **not** come with any extra perks anymore!
 
 [Link to my Ko-fi](https://ko-fi.com/hjfod)
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # BetterEdit 6
 
+## v6.10.0-alpha.8
+ * Fix being able to zoom out infinitely in the editor on Android
+
 ## v6.10.0-alpha.7
  * <co>Group Summary</c> is back!
 
diff --git a/mod.json b/mod.json
@@ -1,5 +1,5 @@
 {
-	"geode": "4.3.1",
+	"geode": "4.6.1",
 	"version": "6.10.0-alpha.7",
 	"gd": {
 		"win": "2.2074",
diff --git a/src/features/ButtonRowsBypass.cpp b/src/features/ButtonRowsBypass.cpp
@@ -14,7 +14,7 @@ class $modify(EditorOptionsLayer) {
     void onButtonsPerRow(CCObject* sender) {
         if (0) EditorOptionsLayer::onButtonsPerRow(sender);
 
-        m_buttonsPerRow = clamp(m_buttonsPerRow + (sender->getTag() ? 1 : -1), 6, 128);
+        m_buttonsPerRow = std::clamp(m_buttonsPerRow + (sender->getTag() ? 1 : -1), 6, 128);
         m_buttonsPerRowLabel->setString(std::to_string(m_buttonsPerRow).c_str());
     }
 };
diff --git a/src/features/EditMixedValues.cpp b/src/features/EditMixedValues.cpp
@@ -143,8 +143,8 @@ class MixedValuesInput : public CCMenu {
 
     void onArrow(CCObject* sender) {
         for (auto obj : m_targets) {
-            auto val = clamp(
-                m_config.get(obj) + sender->getTag(),
+            auto val = std::clamp(
+                static_cast<T>(m_config.get(obj) + sender->getTag()),
                 m_config.limits.min, m_config.limits.max
             );
             m_config.set(obj, val, sender->getTag() > 0 ? Direction::Increment : Direction::Decrement);
@@ -179,7 +179,7 @@ class MixedValuesInput : public CCMenu {
     }
     void override(T value, bool updateLabel = true) {
         for (auto obj : m_targets) {
-            m_config.set(obj, clamp(value, m_config.limits.min, m_config.limits.max), Direction::Reset);
+            m_config.set(obj, std::clamp(value, m_config.limits.min, m_config.limits.max), Direction::Reset);
         }
         if (updateLabel) {
             this->updateLabel();
@@ -253,7 +253,7 @@ class MixedValuesInput : public CCMenu {
         if (this->isMixed()) {
             auto minmax = this->getMinMax();
             m_input->setEnabled(false);
-            m_input->getInputNode()->m_placeholderLabel->setOpacity(255);
+            m_input->getInputNode()->m_textLabel->setOpacity(255);
             m_input->defocus();
             m_unmixBtn->setVisible(true);
             m_input->setString(fmt::format("{}..{}", minmax.min, minmax.max));
diff --git a/src/features/FixMouseControls.cpp b/src/features/FixMouseControls.cpp
@@ -41,7 +41,7 @@ class $modify(EditorUI) {
                 std::log(std::max(zoom, .001f)) - y * .01f
             ));
             // zoom limit
-            zoom = clamp(zoom, .1f, 10000000.f);
+            zoom = std::clamp(zoom, .1f, 10000000.f);
 
             if (Mod::get()->getSettingValue<bool>("mouse-move-on-zoom")) {
                 auto mousePos = getMousePos();
diff --git a/src/features/PinchToZoom.cpp b/src/features/PinchToZoom.cpp
@@ -65,7 +65,8 @@ class $modify(EditorUI) {
             auto distNow = firstLoc.getDistance(secondLoc);
             
             auto const mult = m_fields->m_initialDistance / distNow;
-            auto zoom = std::max(m_fields->m_initialScale / mult, 0.1f);
+            // zoom limit
+            auto zoom = std::clamp(m_fields->m_initialScale / mult, .1f, 10000000.f);
             // safety measure, nan zoom can really mess up gd
             if (std::isnan(zoom) || std::isinf(zoom)) {
                 this->updateZoom(1.f);
diff --git a/src/features/about/AboutBEButton.cpp b/src/features/about/AboutBEButton.cpp
@@ -3,7 +3,6 @@
 #include <Geode/ui/BasedButtonSprite.hpp>
 #include <Geode/binding/GameToolbox.hpp>
 #include "AboutBEPopup.hpp"
-#include "SupportPopup.hpp"
 #include <utils/Pro.hpp>
 
 using namespace geode::prelude;
@@ -14,65 +13,6 @@ class $modify(AboutBEPauseLayer, EditorPauseLayer) {
         if (!EditorPauseLayer::init(lel))
             return false;
 
-        if (!Mod::get()->template getSavedValue<bool>("dont-show-support-button")) {
-            if (auto topMenu = this->getChildByID("top-menu")) {
-                auto supportSpr = CCSprite::createWithSpriteFrameName("support-btn.png"_spr);
-
-                auto glow = CCSprite::createWithSpriteFrameName("support-btn-glow.png"_spr);
-                glow->setZOrder(2);
-                glow->setBlendFunc({ GL_SRC_ALPHA, GL_ONE });
-                glow->setOpacity(125);
-                glow->runAction(CCRepeat::create(
-                    CCSequence::create(
-                        CCEaseInOut::create(CCFadeTo::create(1.5f, 0), 4.f),
-                        CCEaseInOut::create(CCFadeTo::create(1.5f, 125), 4.f),
-                        nullptr
-                    ),
-                    1000
-                ));
-                supportSpr->addChildAtPosition(glow, Anchor::Center);
-
-                auto particleFall = GameToolbox::particleFromString("37a-1a2a0.33a15a-90a92a0a0a59a0a0a-10a0a0a0a0a1a1a0a48a1a0a0a0a0.27451a0a1a0a0a1a0a165a1a0a0.686275a0a0.235294a0a1a0a0a0a0.61a0a0a0a0a0a0a0a0a2a1a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0", nullptr, false);
-                particleFall->setZOrder(-1);
-                particleFall->setScaleX(1.61f);
-                particleFall->setScaleY(1.61f);
-                supportSpr->addChildAtPosition(particleFall, Anchor::Bottom);
-
-                // auto particleTop1 = GameToolbox::particleFromString("5a-1a2a0.33a15a-90a180a0a0a59a0a0a-10a0a0a0a0a20a1a75a48a1a0a0a0a0.27451a0a1a0a2a1a0a165a1a0a0.686275a0a0.235294a0a1a0a0a0a0.61a0a21a8a29a22a-11a40a1a2a1a0a0a0a158a0a0a0a0a0a0a0a0a0a0a0a0a0a0", nullptr, false);
-                // particleTop1->setPosition({ supportSpr->getContentWidth() * .25f, supportSpr->getContentHeight() / 2 });
-                // particleTop1->setZOrder(1);
-                // particleTop1->setScaleX(.91f);
-                // particleTop1->setScaleY(.91f);
-                // particleTop1->setOpacity(105);
-                // supportSpr->addChild(particleTop1);
-
-                // auto particleTop2 = GameToolbox::particleFromString("5a-1a2a0.33a15a-90a180a0a0a59a0a0a-10a0a0a0a0a20a1a75a48a1a0a0a0a0.27451a0a1a0a2a1a0a165a1a0a0.686275a0a0.235294a0a1a0a0a0a0.61a0a21a8a29a22a-11a40a1a2a1a0a0a0a158a0a0a0a0a0a0a0a0a0a0a0a0a0a0", nullptr, false);
-                // particleTop2->setPosition({ supportSpr->getContentWidth() * .75f, supportSpr->getContentHeight() / 2 });
-                // particleTop2->setZOrder(1);
-                // particleTop2->setScaleX(.91f);
-                // particleTop2->setScaleY(.91f);
-                // particleTop2->setOpacity(105);
-                // supportSpr->addChild(particleTop2);
-
-                supportSpr->setScale(.8f);
-                supportSpr->runAction(CCRepeat::create(
-                    CCSequence::create(
-                        CCEaseInOut::create(CCScaleTo::create(1.5f, .7f), 4.f),
-                        CCEaseInOut::create(CCScaleTo::create(1.5f, .8f), 4.f),
-                        nullptr
-                    ),
-                    1000
-                ));
-                
-                auto supportBtn = CCMenuItemSpriteExtra::create(
-                    supportSpr, this, menu_selector(AboutBEPauseLayer::onSupport)
-                );
-                supportBtn->setID("support-be-btn"_spr);
-                topMenu->addChild(supportBtn);
-                topMenu->updateLayout();
-            }
-        }
-
         auto menu = this->getChildByID("guidelines-menu");
 
         auto spr = CCSprite::createWithSpriteFrameName("be-button.png"_spr);
@@ -134,9 +74,6 @@ class $modify(AboutBEPauseLayer, EditorPauseLayer) {
         ));
     }
 
-    void onSupport(CCObject*) {
-        SupportPopup::create(true)->show();
-    }
     void onAbout(CCObject*) {
         AboutBEPopup::create()->show();
     }
diff --git a/src/features/about/AboutBEPopup.cpp b/src/features/about/AboutBEPopup.cpp
@@ -1,6 +1,5 @@
 #include "AboutBEPopup.hpp"
 #include "ChangelogPopup.hpp"
-#include "SupportPopup.hpp"
 #include <Geode/ui/GeodeUI.hpp>
 #include <Geode/ui/MDTextArea.hpp>
 #include <Geode/binding/ButtonSprite.hpp>
@@ -9,6 +8,7 @@
 
 #ifdef BETTEREDIT_PRO
 #include <pro/features/supporters/SupportersPopup.hpp>
+#include <pro/features/supporters/ActivateLicensePopup.hpp>
 #endif
 
 struct Dev {
@@ -208,8 +208,25 @@ void AboutBEPopup::onClose(CCObject* sender) {
 }
 
 void AboutBEPopup::onSupport(CCObject*) {
-    SupportPopup::create(false)->show();
-    // openSupportPopup(Mod::get());
+#ifdef BETTEREDIT_PRO
+    createQuickPopup(
+        "Support BetterEdit",
+        "The <cp>Supporter Perks</c> for BetterEdit are <co>about to be "
+        "discontinued</c> as my financial situation has gotten better and "
+        "<cj>I don't want to paywall features</c>. If you still want to support the mod "
+        "and donate a thank you, feel free to do so, but be aware that the only "
+        "perk I can offer is your name in the Supporters List!",
+        "OK", "Activate Existing License",
+        380,
+        [](auto, bool btn2) {
+            if (btn2) {
+                ActivateLicensePopup::tryShowIfLoggedIn();
+            }
+        }
+    );
+#else
+    openSupportPopup(Mod::get());
+#endif
 }
 void AboutBEPopup::onSupporters(CCObject*) {
 #ifdef BETTEREDIT_PRO
diff --git a/src/features/about/ChangelogPopup.cpp b/src/features/about/ChangelogPopup.cpp
@@ -3,7 +3,7 @@
 #include <Geode/ui/MDTextArea.hpp>
 
 static std::string parseChangelog(std::optional<VersionInfo> const& since) {
-    auto changelog = Mod::get()->getMetadata().getChangelog().value_or(std::string());
+    auto changelog = Mod::get()->getMetadataRef().getChangelog().value_or(std::string());
     auto res = std::string();
 
     bool validHeader = false;
diff --git a/src/features/about/SupportPopup.cpp b/src/features/about/SupportPopup.cpp
diff --git a/src/features/about/SupportPopup.hpp b/src/features/about/SupportPopup.hpp
diff --git a/src/utils/Editor.cpp b/src/utils/Editor.cpp
@@ -310,7 +310,7 @@ void be::focusEditor(EditorUI* ui, CCRect const& rect, bool smooth) {
     const auto objLayer = ui->m_editorLayer->m_objectLayer;
     const auto winSize = CCDirector::get()->getWinSize();
     const auto viewPortToFitTo = winSize / 3;
-    const auto scale = clamp(
+    const auto scale = std::clamp(
         std::min(viewPortToFitTo.width / rect.size.width, viewPortToFitTo.height / rect.size.height),
         .25f, 1.5f
     );
diff --git a/src/utils/NextFreeOffsetInput.hpp b/src/utils/NextFreeOffsetInput.hpp
@@ -52,7 +52,7 @@ class NextFreeOffsetInput : public CCNode {
         }
         m_input->setCallback([](auto str) {
             if (auto value = numFromString<ValueType>(str)) {
-                s_value = clamp(value.unwrap(), Source::MIN_VALUE, Source::MAX_VALUE);
+                s_value = std::clamp(value.unwrap(), Source::MIN_VALUE, Source::MAX_VALUE);
             }
             else {
                 s_value = Source::MIN_VALUE;
diff --git a/support.md b/support.md
@@ -1,9 +1,9 @@
 
 BetterEdit is first and foremost <cy>a passion project</c>, but if you would like to support development, I have a Ko-fi!
 
-[Link to my Ko-fi](https://ko-fi.com/hjfod)
+Supporters used to get exclusive features, but those features have since been made free for everyone. Feel free to donate if you want to thank me for my work on BetterEdit and Geode, but be aware that it'll **not** come with any extra perks anymore!
 
-Supporters get <co>Early Access</c> to features. I also plan on adding extra advanced features for Supporters!
+[Link to my Ko-fi](https://ko-fi.com/hjfod)
 
 ## <cy>Do not donate any money you need yourself</c>.
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "geode": "4.3.1",`
	`2`	`+ "geode": "4.6.1",`
`3`	`3`	`"version": "6.10.0-alpha.7",`
`4`	`4`	`"gd": {`
`5`	`5`	`"win": "2.2074",`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class $modify(EditorOptionsLayer) {`
`14`	`14`	`void onButtonsPerRow(CCObject* sender) {`
`15`	`15`	`if (0) EditorOptionsLayer::onButtonsPerRow(sender);`
`16`	`16`
`17`		`- m_buttonsPerRow = clamp(m_buttonsPerRow + (sender->getTag() ? 1 : -1), 6, 128);`
	`17`	`+ m_buttonsPerRow = std::clamp(m_buttonsPerRow + (sender->getTag() ? 1 : -1), 6, 128);`
`18`	`18`	`m_buttonsPerRowLabel->setString(std::to_string(m_buttonsPerRow).c_str());`
`19`	`19`	`}`
`20`	`20`	`};`