Merge branch 'main' of https://github.com/geode-sdk/devtools

Author: km7dev

changelog.md

@@ -1,3 +1,8 @@
+## v1.14.0
+* Bump to Geode `v5.6.1`
+* Fix keyboard arrows typing 'a' characters
+* Add layout padding attribute
+
 ## v1.13.0
 * Updated for Geode v5.0.0 and Geometry Dash 2.2081
 

include/API.hpp

@@ -8,6 +8,8 @@
 #include <string>
 #include <type_traits>
 #include <Geode/loader/Dispatch.hpp>
+
+#undef MY_MOD_ID
 #define MY_MOD_ID "geode.devtools"
 
 namespace devtools {

mod.json

@@ -1,6 +1,6 @@
 {
-	"geode": "5.0.1",
-	"version": "v1.13.1",
+	"geode": "5.6.1",
+	"version": "v1.14.0",
 	"gd": {
 		"win": "2.2081",
 		"android": "2.2081",

src/backend.cpp

@@ -432,6 +432,14 @@ class $modify(CCIMEDispatcher) {
         if (!io.WantCaptureKeyboard) {
             CCIMEDispatcher::dispatchInsertText(text, len, key);
         }
+
+		switch (key) {
+			case KEY_Left:
+			case KEY_Right:
+				return;
+			default: break;
+		}
+		
         std::string str(text, len);
         io.AddInputCharactersUTF8(str.c_str());
     }
@@ -549,4 +557,4 @@ class $modify(CCKeyboardDispatcher) {
     }
     #endif
 };
-#endif
+#endif

src/pages/Attributes.cpp

@@ -910,7 +910,13 @@ void DevTools::drawLayoutAttributes(CCNode* node){
                 layout->setGap(gap);
                 updateLayout = true;
             }
-            
+
+            auto padding = layout->getPadding();
+            if (ImGui::DragFloat4("Padding", &padding.left)) {
+                layout->setPadding(padding);
+                updateLayout = true;
+            }
+
             auto ignoreInvisibleChildren = layout->isIgnoreInvisibleChildren();
             if (ImGui::Checkbox("Ignore Invisible Children", &ignoreInvisibleChildren)) {
                 layout->ignoreInvisibleChildren(ignoreInvisibleChildren);
@@ -1087,6 +1093,12 @@ void DevTools::drawLayoutAttributes(CCNode* node){
                 updateLayout = true;
             }
 
+            auto padding = layout->getPadding();
+            if (ImGui::DragFloat4("Padding", &padding.left)) {
+                layout->setPadding(padding);
+                updateLayout = true;
+            }
+
             auto ignoreInvisibleChildren = layout->isIgnoreInvisibleChildren();
             if (ImGui::Checkbox("Ignore Invisible Children", &ignoreInvisibleChildren)) {
                 layout->ignoreInvisibleChildren(ignoreInvisibleChildren);

src/platform/Mac.mm

@@ -18,7 +18,9 @@
 
 #include <mach-o/dyld_images.h>
 #include <mach-o/dyld.h>
+#define CommentType CommentTypeDummy
 #import <Foundation/Foundation.h>
+#undef CommentType
 
 #import <CoreGraphics/CoreGraphics.h>
 #ifdef GEODE_IS_MACOS