my fault i didnt test mac

FireMario211 · Feb 8, 2024 · 4b596ad · 4b596ad
1 parent b0a1225
commit 4b596ad
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,5 @@
+# v1.4.1
+    - Fixed Mac OS issue with not being able to open menu.
 # v1.4.0
     - Added Dear ImGui back (from request)
     - Fixed Accurate Percentage on levels with the End Level Trigger (Thanks dankmeme01!)

diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "2.0.0",
-	"version": "v1.4.0",
+	"version": "v1.4.1",
 	"gd": {
 		"win": "2.204",
         "mac": "2.200",

diff --git a/resources/hacks/settings.json b/resources/hacks/settings.json
@@ -103,7 +103,7 @@
         "default": "button"
     },
     {
-        "name": "Menu Style",
+        "name": "Menu-Style",
         "desc": "",
         "opcodes": [],
         "type": "dropdown",

diff --git a/src/ImGui.cpp b/src/ImGui.cpp
@@ -230,7 +230,7 @@ class $modify(MenuLayer) {
                                     } else if (name == "Button Position Y") {
                                         Hacks::Settings::setSettingValue(&settings, *hack, hack->value.intValue);
                                         if (prismButton != nullptr) prismButton->setPositionY(hack->value.intValue);
-                                    } else if (name == "Menu Style") {
+                                    } else if (name == "Menu-Style") {
                                         Hacks::Settings::setSettingValue(&settings, *hack, hack->value.intValue);
                                         static_cast<PrismButton*>(prismButton)->showImGuiMenu = false;
                                     } else {
@@ -390,7 +390,7 @@ class $modify(MenuLayer) {
                                             if (ImGui::Selectable(values[i].as_string().c_str(), isSelected)) {
                                                 hack->value.intValue = i;
                                                 Hacks::Settings::setSettingValue(&settings, *hack, hack->value.intValue);
-                                                if (name == "Menu Style") {
+                                                if (name == "Menu-Style") {
                                                     prismButton->showImGuiMenu = !prismButton->showImGuiMenu;
                                                 }
                                             }

diff --git a/src/PrismButton.hpp b/src/PrismButton.hpp
@@ -113,7 +113,10 @@ class PrismButton : public CCMenu {
         return CCMenuItemSpriteExtra::create(myButtonSpr, ret, menu_selector(PrismButton::onButtonClicked));
     }
     void onButtonClicked(CCObject* p0) {
-        HackItem* menuStyle = Hacks::getHack("Menu Style");
+        HackItem* menuStyle = Hacks::getHack("Menu-Style");
+        #ifdef GEODE_IS_MACOS 
+        menuStyle->value.intValue = 1;
+        #endif
         if (menuStyle->value.intValue == 0) { // imgui
             showImGuiMenu = !showImGuiMenu;
         } else {

diff --git a/src/PrismUI.cpp b/src/PrismUI.cpp
@@ -384,7 +384,7 @@ void PrismUIButton::onDropdownBtn(CCObject* sender) {
     auto settings = Mod::get()->getSavedValue<SettingHackStruct>("values");
     hack->value.intValue = index;
     Hacks::Settings::setSettingValue(&settings, *hack, hack->value.intValue);
-    if (hack->name == "Menu Style") {
+    if (hack->name == "Menu-Style") {
         auto obj = static_cast<PrismUI*>(CCScene::get()->getChildByID("prism-menu"));
         obj->onClose(sender);
     } else if (hack->name == "Theme") {

diff --git a/src/hacks.hpp b/src/hacks.hpp
@@ -195,15 +195,7 @@ class Hacks {
                             value = Hacks::Settings::getSettingValue(settings, name).as_int();
                             settingExists = true;
                         } else {
-                            if (name == "Menu Style") {
-                                #ifdef GEODE_IS_ANDROID
-                                value = HackValue(1);
-                                #else
-                                value = HackValue(0);
-                                #endif
-                            } else {
-                                value = HackValue(obj.get<int>("default"));
-                            }
+                            value = HackValue(obj.get<int>("default"));
                         }
                     } else if (type == "float") {
                         if (Hacks::Settings::settingContainsHack(settings, name) && !reset) {

diff --git a/src/main.cpp b/src/main.cpp
@@ -98,9 +98,9 @@ class $modify(CCKeyboardDispatcher) {
     bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool arr) {
         if (down && (key == KEY_Tab)) {
             auto prismButton = typeinfo_cast<PrismButton*>(CCScene::get()->getChildByID("prism-icon"));
-            if (prismButton == nullptr) return true;
-            HackItem* menuStyle = Hacks::getHack("Menu Style");
+            HackItem* menuStyle = Hacks::getHack("Menu-Style");
             #ifdef GEODE_IS_MACOS 
+            if (prismButton == nullptr) return true;
             menuStyle->value.intValue = 1;
             #endif
             if (menuStyle->value.intValue == 0) { // imgui