瀏覽代碼

latest oxygine

dmuratshin 9 年之前
父節點
當前提交
672640855d
共有 2 個文件被更改,包括 8 次插入8 次删除
  1. 7 7
      src/flow/Transition.cpp
  2. 1 1
      src/flow/flow.cpp

+ 7 - 7
src/flow/Transition.cpp

@@ -48,14 +48,14 @@ namespace oxygine
             if (current->_dialog)
             if (current->_dialog)
             {
             {
                 if (!back)
                 if (!back)
-                    getStage()->insertChildAfter(next->_holder, current->_holder);
+                    current->_holder->insertSiblingAfter(next->_holder);
             }
             }
             else
             else
             {
             {
                 if (back)
                 if (back)
-                    getStage()->insertChildBefore(next->_holder, current->_holder);
+                    current->_holder->insertSiblingBefore(next->_holder);
                 else
                 else
-                    getStage()->insertChildAfter(next->_holder, current->_holder);
+                    current->_holder->insertSiblingAfter(next->_holder);
             }
             }
         }
         }
 
 
@@ -101,7 +101,7 @@ namespace oxygine
             {
             {
                 _fade->setAlpha(0);
                 _fade->setAlpha(0);
                 _fade->addTween(Actor::TweenAlpha(255), _duration);
                 _fade->addTween(Actor::TweenAlpha(255), _duration);
-                holder->getParent()->insertChildBefore(_fade, holder);
+                holder->insertSiblingBefore(_fade);
             }
             }
 
 
 
 
@@ -156,8 +156,8 @@ namespace oxygine
 
 
         void TransitionShutters::_run(spScene current, spScene next, bool back)
         void TransitionShutters::_run(spScene current, spScene next, bool back)
         {
         {
-            getStage()->insertChildAfter(left, current->getHolder());
-            getStage()->insertChildAfter(right, current->getHolder());
+            current->getHolder()->insertSiblingAfter(left);
+            current->getHolder()->insertSiblingAfter(right);
 
 
             int dur = 500;
             int dur = 500;
             left->setX(-left->getWidth());
             left->setX(-left->getWidth());
@@ -167,7 +167,7 @@ namespace oxygine
             spTween t = right->addTween(Actor::TweenX(getStage()->getWidth() / 2), dur);
             spTween t = right->addTween(Actor::TweenX(getStage()->getWidth() / 2), dur);
             t->setDoneCallback([ = ](Event*)
             t->setDoneCallback([ = ](Event*)
             {
             {
-                getStage()->insertChildAfter(next->getHolder(), current->getHolder());
+                current->getHolder()->insertSiblingAfter(next->getHolder());
                 current->getHolder()->detach();
                 current->getHolder()->detach();
 
 
                 left->addTween(Actor::TweenX(-left->getWidth()), dur);
                 left->addTween(Actor::TweenX(-left->getWidth()), dur);

+ 1 - 1
src/flow/flow.cpp

@@ -140,7 +140,7 @@ namespace oxygine
                 current->postHiding();
                 current->postHiding();
             }
             }
 
 
-            getStage()->insertChildBefore(_touchBlocker, next->getHolder());
+            next->getHolder()->insertSiblingBefore(_touchBlocker);
 
 
             if (!_back || !current->_dialog)
             if (!_back || !current->_dialog)
                 next->postShowing();
                 next->postShowing();