Merge branch 'v6' of https://github.com/HJfod/BetterEdit into v6

HJfod · Sep 18, 2024 · aa05821 · aa05821
2 parents aaa2392 + f070aae
commit aa05821
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # BetterEdit 6
 
+## v6.8.0-alpha.5
+ * Fix color trigger popup crashing (& also make <cc>HSV Preview</c> more responsive)
+
 ## v6.8.0-alpha.4
  * Fix a bug with servers causing supporter popups to not work
 

diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "3.7.2",
-	"version": "6.8.0-alpha.4",
+	"version": "6.8.0-alpha.5",
 	"gd": {
 		"win": "2.206",
 		"mac": "2.206",

diff --git a/src/features/about/AboutBEPopup.cpp b/src/features/about/AboutBEPopup.cpp
@@ -8,7 +8,7 @@
 #include <utils/Pro.hpp>
 
 #ifdef BETTEREDIT_PRO
-#include <pro/ui/SupportersPopup.hpp>
+#include <pro/features/supporters/SupportersPopup.hpp>
 #endif
 
 struct Dev {

diff --git a/src/features/backups/QuickSave.cpp b/src/features/backups/QuickSave.cpp
@@ -20,7 +20,7 @@ static std::filesystem::path getAutoSaveDir() {
 }
 
 static bool CREATING_AUTO_SAVE = false;
-void ::createAutoSave(LevelEditorLayer* lel) {
+void createAutoSave(LevelEditorLayer* lel) {
     CREATING_AUTO_SAVE = true;
     fakeEditorPauseLayer(lel)->saveLevel();
     CREATING_AUTO_SAVE = false;

diff --git a/src/features/scaling/EditorUIScaling.cpp b/src/features/scaling/EditorUIScaling.cpp
@@ -160,9 +160,11 @@ class $modify(ScaledUI, EditorUI) {
         auto winSize = CCDirector::get()->getWinSize();
         for (auto c : CCArrayExt<CCNode*>(this->getChildren())) {
             if (auto bar = typeinfo_cast<EditButtonBar*>(c)) {
-                getChild(bar, 0)->setPositionX(-winSize.width / 2 + 5);
-                if (auto menu = getChildOfType<CCMenu>(bar, 0)) {
-                    menu->setPositionX(winSize.width / 2 + 5);
+                if (bar->getChildrenCount() > 0) {
+                    getChild(bar, 0)->setPositionX(-winSize.width / 2 + 5);
+                    if (auto menu = getChildOfType<CCMenu>(bar, 0)) {
+                        menu->setPositionX(winSize.width / 2 + 5);
+                    }
                 }
                 bar->setPositionX(winSize.width / 2);
             }