dm 7 yıl önce
ebeveyn
işleme
3810261af3
2 değiştirilmiş dosya ile 12 ekleme ve 2 silme
  1. 9 1
      src/flow/Transition.cpp
  2. 3 1
      src/flow/flow.cpp

+ 9 - 1
src/flow/Transition.cpp

@@ -12,6 +12,8 @@ namespace oxygine
     namespace flow
     {
 
+		bool _TRANSITION_ADD_CHILD = false;
+
         void Transition::assign(Scene* scene)
         {
             spTransition t = new Transition;
@@ -59,7 +61,13 @@ namespace oxygine
                 if (back)
                     current->_holder->insertSiblingBefore(next->_holder);
                 else
-                    current->_holder->insertSiblingAfter(next->_holder);
+				{ 
+					if (_TRANSITION_ADD_CHILD)
+						current->_holder->_getStage()->addChild(next->_holder);
+					else
+						current->_holder->insertSiblingAfter(next->_holder);
+				}
+                    
             }
         }
 

+ 3 - 1
src/flow/flow.cpp

@@ -37,7 +37,6 @@ namespace oxygine
             _touchBlocker->setName("Scene::_touchBlocker");
             _touchBlocker->setPosition(-10000, -10000);
             _touchBlocker->setSize(20000, 20000);
-            _touchBlocker->setPriority(10000);
             _touchBlocker->setName("touchBlocker");
 
             _defaultTransition = new TransitionFade;
@@ -200,7 +199,9 @@ namespace oxygine
 
             _trans = next->runTransition(this, current, back);
 
+			_touchBlocker->setPriority(10000);
             getStage()->addChild(_touchBlocker);
+
             _wasTouchBlocked = false;
             _wasBackBlocked = false;
             _tm = getTimeMS();
@@ -223,6 +224,7 @@ namespace oxygine
                 current->postHiding();
             }
 
+			_touchBlocker->setPriority(next->getHolder()->getPriority());
             next->getHolder()->insertSiblingBefore(_touchBlocker);
 
             if (_back)