clamp button position, fix crash

Author: matcool

src/backend.cpp

@@ -373,6 +373,7 @@ class $modify(CCTouchDispatcher) {
         }
 
         const auto pos = toVec2(touch->getLocation());
+        GEODE_MOBILE(io.AddMouseSourceEvent(ImGuiMouseSource_TouchScreen);)
         io.AddMousePosEvent(pos.x, pos.y);
         if (io.WantCaptureMouse) {
             bool didGDSwallow = false;
@@ -406,6 +407,7 @@ class $modify(CCTouchDispatcher) {
             // TODO: dragging out of gd makes it click in imgui
             if (!didGDSwallow) {
                 if (type == CCTOUCHBEGAN || type == CCTOUCHMOVED) {
+                    GEODE_MOBILE(io.AddMouseSourceEvent(ImGuiMouseSource_TouchScreen);)
                     io.AddMouseButtonEvent(0, true);
                 }
                 else {

src/nodes/DragButton.cpp

@@ -4,40 +4,37 @@
 using namespace geode::prelude;
 
 bool DragButton::init(CCNode* node, std::function<void()> onPress) {
-	if (!CCLayer::init()) return false;
+    if (!CCLayer::init()) return false;
     this->setTouchEnabled(true);
-	this->setAnchorPoint({.5f, .5f});
+    this->setAnchorPoint({.5f, .5f});
     this->ignoreAnchorPointForPosition(false);
-	this->scheduleUpdate();
-	if (node) {
-		this->setContentSize(node->getScaledContentSize());
-		this->addChildAtPosition(node, Anchor::Center, CCPoint{0, 0});
-	}
-	this->m_onPress = onPress;
-	return true;
+    this->scheduleUpdate();
+    if (node) {
+        this->setContentSize(node->getScaledContentSize());
+        this->addChildAtPosition(node, Anchor::Center, CCPoint{0, 0});
+    }
+    this->m_onPress = onPress;
+    return true;
 }
 
 bool DragButton::ccTouchBegan(CCTouch* touch, CCEvent* event) {
-	if (!this->m_bVisible) return false;
-	CCPoint local = convertToNodeSpace(touch->getLocation());
-	if (this->getContentWidth() > local.x && local.x > 0 && this->getContentHeight() > local.y && local.y > 0) {
+    if (!this->m_bVisible) return false;
+    CCPoint local = convertToNodeSpace(touch->getLocation());
+    if (this->getContentWidth() > local.x && local.x > 0 && this->getContentHeight() > local.y && local.y > 0) {
         this->stopActionByTag(123);
         auto action = CCEaseSineOut::create(CCScaleTo::create(.3f, .8f));
         action->setTag(123);
         this->runAction(action);
 
-		m_diff = this->getParent()->convertToNodeSpace(touch->getLocation()) - this->getPosition();
-		return true;
-	}
-	return false;
+        m_diff = this->getParent()->convertToNodeSpace(touch->getLocation()) - this->getPosition();
+        return true;
+    }
+    return false;
 }
 
 void DragButton::ccTouchMoved(CCTouch* touch, CCEvent* event) {
     auto pos = this->getParent()->convertToNodeSpace(touch->getLocation()) - m_diff;
-    auto winSize = CCDirector::get()->getWinSize();
-    pos.x = std::clamp(pos.x, 0.f, winSize.width);
-    pos.y = std::clamp(pos.y, 0.f, winSize.height);
-	this->setPosition(pos);
+    this->setPosition(pos);
 }
 
 void DragButton::ccTouchEnded(CCTouch* touch, CCEvent* event) {
@@ -46,45 +43,46 @@ void DragButton::ccTouchEnded(CCTouch* touch, CCEvent* event) {
     action->setTag(123);
     this->runAction(action);
 
-	if ((touch->getLocation() - touch->getStartLocation()).getLength() > 3.f) return;
-	if (this->m_onPress) this->m_onPress();
+    if ((touch->getLocation() - touch->getStartLocation()).getLength() > 3.f) return;
+    if (this->m_onPress) this->m_onPress();
 }
 
 void DragButton::ccTouchCancelled(CCTouch* touch, CCEvent* event) {
-	this->ccTouchEnded(touch, event);
-}
-
-void DragButton::setCallback(std::function<void()> onPress) {
-	this->m_onPress = onPress;
-}
-
-std::function<void()> DragButton::getCallback() {
-	return this->m_onPress;
+    this->ccTouchEnded(touch, event);
 }
 
 void DragButton::registerWithTouchDispatcher() {
     CCTouchDispatcher::get()->addTargetedDelegate(this, -512, true);
 }
 
 DragButton* DragButton::create(CCNode* node, std::function<void ()> onPress) {
-	auto ret = new DragButton; 
-	if (ret->init(node, onPress)) {
-		ret->autorelease();
-		return ret;
-	}
-	delete ret;
-	return nullptr;
+    auto ret = new DragButton;
+    if (ret->init(node, onPress)) {
+        ret->autorelease();
+        return ret;
+    }
+    delete ret;
+    return nullptr;
 }
 
 void DragButton::update(float dt) {
-	const Settings& settings = DevTools::get()->getSettings();
-	if (PlayLayer::get() && !CCScene::get()->getChildByType<PauseLayer>(0) && !settings.buttonInGame) {
-		setVisible(false);
-	} else if (auto lel = LevelEditorLayer::get(); lel && ((lel->m_playbackMode == PlaybackMode::Playing && !settings.buttonInGame) || !settings.buttonInEditor)) {
-		setVisible(false);
-	} else {
-		setVisible(true);
-	}
+    const Settings& settings = DevTools::get()->getSettings();
+    if (PlayLayer::get() && !CCScene::get()->getChildByType<PauseLayer>(0) && !settings.buttonInGame) {
+        setVisible(false);
+    } else if (auto lel = LevelEditorLayer::get(); lel && ((lel->m_playbackMode == PlaybackMode::Playing && !settings.buttonInGame) || !settings.buttonInEditor)) {
+        setVisible(false);
+    } else {
+        setVisible(true);
+    }
+}
+
+void DragButton::setPosition(cocos2d::CCPoint const& pos_) {
+    auto winSize = CCDirector::get()->getWinSize();
+    float pad = 5.f;
+    auto pos = pos_;
+    pos.x = std::clamp(pos.x, pad, winSize.width - pad);
+    pos.y = std::clamp(pos.y, pad, winSize.height - pad);
+    CCNode::setPosition(pos);
 }
 
 DragButton* DragButton::get() {

src/nodes/DragButton.hpp

@@ -18,9 +18,8 @@ class DragButton : public cocos2d::CCLayer {
 
 	void update(float dt) override;
 public:
-	void setCallback(std::function<void()> onPress);
-	std::function<void()> getCallback();
-
 	static DragButton* create(cocos2d::CCNode* node, std::function<void()> onPress);
 	static DragButton* get();
+
+	void setPosition(cocos2d::CCPoint const& position) override;
 };

src/pages/Tree.cpp

@@ -92,7 +92,7 @@ void DevTools::drawTree() {
 #endif
     m_prevQuery = m_searchQuery;
     ImGui::SetNextItemWidth(-1.f);
-    ImGui::InputTextWithHint("", U8STR(FEATHER_SEARCH " Search for a node..."), &m_searchQuery, ImGuiInputTextFlags_EnterReturnsTrue);
+    ImGui::InputTextWithHint("##search", U8STR(FEATHER_SEARCH " Search for a node..."), &m_searchQuery, ImGuiInputTextFlags_EnterReturnsTrue);
 
     this->drawTreeBranch(CCDirector::get()->getRunningScene(), 0);
 }