From eabb68bbcff2c0817abb38ba86c8830eaa5bea8a Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Sat, 1 Apr 2023 17:20:49 +0300 Subject: [PATCH] fix circle button sprite size --- bindings/GeometryDash.bro | 6 +++--- loader/include/Geode/ui/BasedButtonSprite.hpp | 1 + loader/src/ui/nodes/BasedButtonSprite.cpp | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index d23be472..5b744070 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -1244,7 +1244,7 @@ class EditorUI : cocos2d::CCLayer, FLAlertLayerProtocol, ColorSelectDelegate, GJ virtual void scaleChanged(float) = mac 0x25490, win 0x88df0; virtual void scaleChangeEnded() = win 0x88de0; void scaleObjects(cocos2d::CCArray*, float, cocos2d::CCPoint) = mac 0x252e0, win 0x8f150; - void selectObjects(cocos2d::CCArray*, bool) = mac 0x23940, win 0x864a0; + void selectObjects(cocos2d::CCArray* objs, bool ignoreFilters) = mac 0x23940, win 0x864a0; void setupCreateMenu() = mac 0xcb50, win 0x7caf0; void undoLastAction(cocos2d::CCObject*) = mac 0xb830, win 0x87070; void updateButtons() = mac 0x1a300, win 0x78280; @@ -3179,8 +3179,8 @@ class GameObject : CCSpritePlus { bool m_isEffectObject; bool m_randomisedAnimStart; float m_animSpeed; - bool m_blackChild; - bool m_unkOutlineMaybe; + bool m_isBlackObject; + bool m_isBlackObjectWithOutline; float m_blackChildOpacity; bool field_21C; bool m_editor; diff --git a/loader/include/Geode/ui/BasedButtonSprite.hpp b/loader/include/Geode/ui/BasedButtonSprite.hpp index dc59a580..6c741d5e 100644 --- a/loader/include/Geode/ui/BasedButtonSprite.hpp +++ b/loader/include/Geode/ui/BasedButtonSprite.hpp @@ -203,6 +203,7 @@ namespace geode { CircleBaseColor color = CircleBaseColor::Green, CircleBaseSize size = CircleBaseSize::Medium ); + cocos2d::CCSize getMaxTopSize() const override; }; /** diff --git a/loader/src/ui/nodes/BasedButtonSprite.cpp b/loader/src/ui/nodes/BasedButtonSprite.cpp index 861b5dc7..96d22ed8 100644 --- a/loader/src/ui/nodes/BasedButtonSprite.cpp +++ b/loader/src/ui/nodes/BasedButtonSprite.cpp @@ -303,6 +303,10 @@ DECL_BASED_CREATE_FUNS(Leaderboard); DECL_BASED_CREATE_FUNS(Editor); DECL_BASED_CREATE_FUNS(Category); +CCSize CircleButtonSprite::getMaxTopSize() const { + return m_obContentSize * .65f; +} + CCSize EditorButtonSprite::getMaxTopSize() const { return m_obContentSize - CCSize { 8.f, 8.f }; }