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

fix merge conflicts

Browse source
This commit is contained in:
HJfod 2022-10-15 19:03:13 +03:00
parent c926f69790
commit 6b83463972
2 changed files with 1 additions and 12 deletions

1
loader/src/hooks/GeodeNodeMetadata.cpp
View file

@ -2,6 +2,7 @@
#include <Geode/utils/Ref.hpp>
#include <Geode/utils/cocos.hpp>
#include <Geode/modify/Field.hpp>
#include <Geode/utils/WackyGeodeMacros.hpp>
USE_GEODE_NAMESPACE();
using namespace geode::modifier;

12
loader/src/hooks/MenuLayer.cpp
View file

@ -107,19 +107,7 @@ class $modify(CustomMenuLayer, MenuLayer) {
btn->setID("geode-button");
bottomMenu->addChild(btn);
<<<<<<< HEAD
bottomMenu->updateLayout();
=======
bottomMenu->alignItemsHorizontallyWithPadding(3.f);
for (auto node : CCArrayExt<CCNode>(bottomMenu->getChildren())) {
node->setPositionY(y);
}
if (chest) {
bottomMenu->addChild(chest);
chest->release();
}
>>>>>>> main
if (auto node = this->getChildByID("settings-gamepad-icon")) {
node->setPositionX(bottomMenu->getChildByID(