7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix max size of editor button sprites

Browse source
This commit is contained in:
HJfod 2023-03-08 19:31:07 +02:00
parent eb0e4b6b1e
commit 0a37b01845
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
loader/include/Geode/ui/BasedButtonSprite.hpp
View file

@ -158,6 +158,7 @@ namespace geode {
); );
cocos2d::CCPoint getTopOffset() const; cocos2d::CCPoint getTopOffset() const;
virtual cocos2d::CCSize getMaxTopSize() const;
virtual ~BasedButtonSprite(); virtual ~BasedButtonSprite();
@ -316,6 +317,7 @@ namespace geode {
EditorBaseColor color = EditorBaseColor::Green, EditorBaseColor color = EditorBaseColor::Green,
EditorBaseSize size = EditorBaseSize::Normal EditorBaseSize size = EditorBaseSize::Normal
); );
cocos2d::CCSize getMaxTopSize() const override;
}; };
/** /**

1
loader/include/Geode/ui/InputNode.hpp
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <Geode/DefaultInclude.hpp> #include <Geode/DefaultInclude.hpp>
#include <Geode/binding/CCTextInputNode.hpp>
#include <cocos2d.h> #include <cocos2d.h>
namespace geode { namespace geode {

14
loader/src/ui/nodes/BasedButtonSprite.cpp
View file

@ -191,17 +191,17 @@ bool BasedButtonSprite::init(CCNode* ontop, BaseType type, int size, int color)
if (ontop) { if (ontop) {
m_onTop = ontop; m_onTop = ontop;
m_onTop->setPosition(this->getContentSize() / 2 + this->getTopOffset()); m_onTop->setPosition(this->getContentSize() / 2 + this->getTopOffset());
limitNodeSize( limitNodeSize(m_onTop, this->getMaxTopSize(), m_onTop->getScale(), .1f);
m_onTop,
m_obContentSize - CCSize(18.f, 18.f),
m_onTop->getScale(), .1f
);
this->addChild(m_onTop); this->addChild(m_onTop);
} }
return true; return true;
} }
CCSize BasedButtonSprite::getMaxTopSize() const {
return m_obContentSize - CCSize(18.f, 18.f);
}
CCPoint BasedButtonSprite::getTopOffset() const { CCPoint BasedButtonSprite::getTopOffset() const {
return { 0, 0 }; return { 0, 0 };
} }
@ -303,6 +303,10 @@ DECL_BASED_CREATE_FUNS(Leaderboard);
DECL_BASED_CREATE_FUNS(Editor); DECL_BASED_CREATE_FUNS(Editor);
DECL_BASED_CREATE_FUNS(Category); DECL_BASED_CREATE_FUNS(Category);
CCSize EditorButtonSprite::getMaxTopSize() const {
return m_obContentSize - CCSize { 8.f, 8.f };
}
TabButtonSprite* TabButtonSprite::create(char const* text, TabBaseColor color, TabBaseSize size) { TabButtonSprite* TabButtonSprite::create(char const* text, TabBaseColor color, TabBaseSize size) {
auto ret = new TabButtonSprite(); auto ret = new TabButtonSprite();
auto label = CCLabelBMFont::create(text, "bigFont.fnt"); auto label = CCLabelBMFont::create(text, "bigFont.fnt");