Remove all cancels

Author: Alphalaneous

src/modules/CanvasRotate/CanvasRotate.cpp

@@ -243,18 +243,6 @@ void CREditorUI::ccTouchEnded(CCTouch* touch, CCEvent* event) {
     module->m_preTransformTouch.erase(touchRef);
 }
 
-void CREditorUI::ccTouchCancelled(CCTouch* touch, CCEvent* event) {
-    auto module = CanvasRotate::get();
-    Ref<CCTouch> touchRef = touch;
-
-    module->m_preTransformTouch[touchRef] = touchRef->getLocation();
-
-    module->m_rotationNode->translate(touchRef);
-    EditorUI::ccTouchCancelled(touchRef, event);
-
-    module->m_preTransformTouch.erase(touchRef);
-}
-
 CCArray* CRLevelEditorLayer::objectsInRect(CCRect rect, bool ignoreLayerCheck) {
     auto result = CCArray::create();
 

src/modules/CanvasRotate/CanvasRotate.hpp

@@ -33,7 +33,6 @@ class $modify(CREditorUI, EditorUI) {
         (void) self.setHookPriorityPre("EditorUI::ccTouchBegan", Priority::EarlyPre);
         (void) self.setHookPriorityPre("EditorUI::ccTouchMoved", Priority::EarlyPre);
         (void) self.setHookPriorityPre("EditorUI::ccTouchEnded", Priority::EarlyPre);
-        (void) self.setHookPriorityPre("EditorUI::ccTouchCancelled", Priority::EarlyPre);
         (void) self.setHookPriorityPre("EditorUI::scrollWheel", Priority::EarlyPre);
     }
 
@@ -52,7 +51,6 @@ class $modify(CREditorUI, EditorUI) {
     bool ccTouchBegan(CCTouch* touch, CCEvent* event);
     void ccTouchMoved(CCTouch* touch, CCEvent* event);
     void ccTouchEnded(CCTouch* touch, CCEvent* event);
-    void ccTouchCancelled(CCTouch* touch, CCEvent* event);
     void triggerSwipeMode();
     void updateSliderRotation(float dt);
 };

src/modules/TransformFix.cpp

@@ -80,21 +80,6 @@ void TFGJTransformControl::ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEven
     GJTransformControl::ccTouchEnded(touch, event);
 }
 
-void TFGJTransformControl::ccTouchCancelled(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) {
-
-    auto fields = m_fields.self();
-    if (fields->m_touchInMenu) {
-        fields->m_touchInMenu = false;
-
-        auto menu = getMenu();
-        if (!menu) return;
-
-        menu->ccTouchCancelled(touch, event);
-        return;
-    }
-    GJTransformControl::ccTouchCancelled(touch, event);
-}
-
 void TFGJTransformControl::scaleButtons(float scale) {
     GJTransformControl::scaleButtons(scale);
     if (tinker::utils::getMod<"razoom.improved_transform_controls">()) return;
@@ -171,18 +156,4 @@ void TFGJScaleControl::ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* e
         return;
     }
     GJScaleControl::ccTouchEnded(touch, event);
-}
-
-void TFGJScaleControl::ccTouchCancelled(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) {
-    auto fields = m_fields.self();
-    if (fields->m_touchInMenu) {
-        fields->m_touchInMenu = false;
-
-        auto menu = getMenu();
-        if (!menu) return;
-
-        menu->ccTouchCancelled(touch, event);
-        return;
-    }
-    GJScaleControl::ccTouchCancelled(touch, event);
 }

src/modules/TransformFix.hpp

@@ -24,13 +24,11 @@ class $modify(TFGJTransformControl, GJTransformControl) {
     bool ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
     void ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
     void ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
-    void ccTouchCancelled(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
 
     static void _onModify(auto& self) {
         (void) self.setHookPriorityBeforePre("GJTransformControl::ccTouchBegan", "razoom.improved_transform_controls");
         (void) self.setHookPriorityBeforePre("GJTransformControl::ccTouchMoved", "razoom.improved_transform_controls");
         (void) self.setHookPriorityBeforePre("GJTransformControl::ccTouchEnded", "razoom.improved_transform_controls");
-        (void) self.setHookPriorityBeforePre("GJTransformControl::ccTouchCancelled", "razoom.improved_transform_controls");
     }
 };
 
@@ -49,5 +47,4 @@ class $modify(TFGJScaleControl, GJScaleControl) {
     bool ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
     void ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
     void ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
-    void ccTouchCancelled(cocos2d::CCTouch* touch, cocos2d::CCEvent* event);
 };