Skip to content

Commit 9ebfee3

Browse files
committed
asdf
1 parent ca23f0a commit 9ebfee3

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

src/Client/CCContentSizeTo.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#ifndef GEODE_IS_MACOS
2+
13
#include <Geode/Geode.hpp>
24

35
//definetly not ai generated
@@ -54,4 +56,6 @@ class CCContentSizeTo : public cocos2d::CCActionInterval
5456
cocos2d::CCSize _endSize;
5557
cocos2d::CCSize _startSize;
5658
cocos2d::CCNode* _target;
57-
};
59+
};
60+
61+
#endif

src/Client/ClippingNode.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#ifndef GEODE_IS_MACOS
2+
13
#pragma once
24

35
#include <Geode/Geode.hpp>
@@ -48,4 +50,6 @@ class ClippingNode : public CCMenu {
4850
CCMenu::visit();
4951
}
5052
}
51-
};
53+
};
54+
55+
#endif

src/Client/Dropdown.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88

99
using namespace geode::prelude;
1010

11+
#ifndef GEODE_IS_MACOS
1112
class Dropdown : public /*CCMenu*/ClippingNode {
13+
#else
14+
class Dropdown : public CCMenu {
15+
#endif
1216
private:
1317
CCLabelBMFont* tex;
1418
CCSize size;
@@ -49,7 +53,11 @@ class Dropdown : public /*CCMenu*/ClippingNode {
4953
{
5054
CCPoint s = ccp(size.width, size.height * (1 + (open ? strs.size() : 0)));
5155
bg->stopAllActions();
56+
#ifndef GEODE_IS_MACOS
5257
bg->runAction(CCEaseInOut::create( CCContentSizeTo::create(0.35f, s / 0.5f), 2.0f));
58+
#else
59+
bg->setContentSize(s / 0.5f);
60+
#endif
5361

5462
if (n)
5563
{
@@ -157,7 +165,9 @@ class Dropdown : public /*CCMenu*/ClippingNode {
157165

158166
void update(float dt)
159167
{
168+
#ifndef GEODE_IS_MACOS
160169
this->setClipRect(CCRectMake(this->getParent()->convertToWorldSpace(this->getPosition()).x - 50, (this->getParent()->convertToWorldSpace(this->getPosition()).y - (bg->getContentSize().height / 2) + size.height) * getScaleY(), (size.width + 50) * getScaleX() + 50, (size.height * (strs.size() + 2)) * getScaleY()));
170+
#endif
161171
}
162172

163173
static Dropdown* create(CCSize size, std::vector<std::string> strs, cocos2d::SEL_MenuHandler callback, int sel = 0) {

0 commit comments

Comments
 (0)