7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' into new-index-but-better

Browse source
This commit is contained in:
HJfod 2024-05-06 12:51:06 +03:00
commit c7c2cc7afb
4 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -243,7 +243,7 @@ if (DEFINED GEODE_TULIPHOOK_REPO_PATH)
message(STATUS "Using ${GEODE_TULIPHOOK_REPO_PATH} for TulipHook")
add_subdirectory(${GEODE_TULIPHOOK_REPO_PATH} ${GEODE_TULIPHOOK_REPO_PATH}/build)
else()
CPMAddPackage("gh:geode-sdk/TulipHook#ada6508")
CPMAddPackage("gh:geode-sdk/TulipHook#a416a7b")
endif()
set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)

1
loader/include/Geode/cocos/include/ccTypes.h vendored
View file

@ -50,7 +50,6 @@ typedef struct _ccHSVValue
float h, s, v;
bool absoluteSaturation;
bool absoluteBrightness;
private: unsigned char __pad[2];
} ccHSVValue;
static inline ccHSVValue

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

@ -30,8 +30,6 @@ namespace geode {
[[deprecated("Use geode::TextInput from the ui/TextInput.hpp header instead")]]
static InputNode* create(float width, char const* placeholder);
void activate() override;
CCTextInputNode* getInput() const;
cocos2d::extension::CCScale9Sprite* getBG() const;

7
loader/src/ui/nodes/InputNode.cpp
View file

@ -22,13 +22,6 @@ CCScale9Sprite* InputNode::getBG() const {
return m_bgSprite;
}
void InputNode::activate() {
auto const size = m_input->getContentSize();
auto const pos = m_input->convertToNodeSpace(getMousePos()) + m_input->m_textField->getAnchorPoint() * size;
m_input->onClickTrackNode(true);
m_input->updateCursorPosition(pos, { CCPointZero, size });
}
void InputNode::setEnabled(bool enabled) {
m_input->setMouseEnabled(enabled);
m_input->setTouchEnabled(enabled);