Merge branch 'release/2.x' into dev_custom

* release/2.x:
  Fix ios editbox keyboard handling (axmolengine#2795)
  Add support for extracting the previous scene from the scene stack (axmolengine#2793)

Author: tkzcfc

core/base/Director.cpp

@@ -966,6 +966,39 @@ void Director::popToSceneStackLevel(int level)
     _sendCleanupToScene = true;
 }
 
+Scene* Director::popPreviousSceneOut()
+{
+    if (_nextScene)
+    {
+        return nullptr;
+    }
+
+    const auto numScenes = _scenesStack.size();
+
+    if (numScenes < 2)
+    {
+        return nullptr;
+    }
+
+    const auto previousSceneIndex = numScenes - 2;
+
+    auto previousScene = _scenesStack.at(previousSceneIndex);
+    previousScene->retain();
+    previousScene->autorelease();
+
+#if AX_ENABLE_GC_FOR_NATIVE_OBJECTS
+    auto sEngine = ScriptEngineManager::getInstance()->getScriptEngine();
+    if (sEngine)
+    {
+        sEngine->releaseScriptObject(this, previousScene);
+    }
+#endif  // AX_ENABLE_GC_FOR_NATIVE_OBJECTS
+
+    _scenesStack.erase(previousSceneIndex);
+
+    return previousScene;
+}
+
 void Director::end()
 {
     _cleanupDirectorInNextLoop = true;

core/base/Director.h

@@ -316,6 +316,15 @@ class AX_DLL Director
      */
     void replaceScene(Scene* scene);
 
+    /** Removes the previous scene from the stack if it exists, and returns it
+     * If there are less than 2 scenes in the stack, or if there is a 
+     * scene switch about to occur, then this call would be invalid, and a nullptr
+     * will be returned.
+     *
+     * Returns previous scene or nullptr if invalid
+     */
+    Scene* popPreviousSceneOut();
+
     /** Ends the execution, releases the running scene.
      * @lua endToLua
      */

core/platform/ios/Device-ios.mm

@@ -904,13 +904,24 @@ static bool _initWithString(std::string_view text,
     return Device::Orientation::Portrait; // fallback
 }
 
+static bool isPhone()
+{
+#if !defined(AX_TARGET_OS_TVOS)
+    return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone;
+#else
+    return false;
+#endif
+}
 Device::Orientation Device::resolveOrientation()
 {
     auto supported = getSupportedOrientations();
     auto preferred = getPreferredOrientation();
     auto physical  = getPhysicalOrientation();
 
     auto tryUse = [&](Orientation o) -> Orientation {
+        if (isPhone() && o == Orientation::ReversePortrait)
+            return Orientation::Portrait; // iPhone treats ReversePortrait as Portrait
+
         return ((supported & toMask(o)) == toMask(o)) ? o : Orientation::Unknown;
     };
 

core/platform/ios/EARenderView-ios.mm

@@ -103,6 +103,12 @@ @implementation EARenderView
 @synthesize isKeyboardShown;
 @synthesize originalRect = originalRect_;
 
+static ax::Rect convertKeyboardRectToViewport(CGRect rect, CGSize viewSize)
+{
+    float flippedY = viewSize.height - rect.origin.y - rect.size.height;
+    return ax::Rect(rect.origin.x, flippedY, rect.size.width, rect.size.height);
+}
+
 + (Class)layerClass
 {
 #if defined(AX_USE_METAL)
@@ -661,12 +667,14 @@ - (void)onUIKeyboardNotification:(NSNotification*)notif
     auto renderView  = ax::Director::getInstance()->getRenderView();
     float scaleX = renderView->getScaleX();
     float scaleY = renderView->getScaleY();
+    
+    const auto backingScaleFactor = self.contentScaleFactor;
 
     // Convert to pixel coordinates
     begin = CGRectApplyAffineTransform(begin,
-        CGAffineTransformScale(CGAffineTransformIdentity, self.contentScaleFactor, self.contentScaleFactor));
+        CGAffineTransformScale(CGAffineTransformIdentity, backingScaleFactor, backingScaleFactor));
     end = CGRectApplyAffineTransform(end,
-        CGAffineTransformScale(CGAffineTransformIdentity, self.contentScaleFactor, self.contentScaleFactor));
+        CGAffineTransformScale(CGAffineTransformIdentity, backingScaleFactor, backingScaleFactor));
 
     // Adjust for viewport offset if needed
     float offestY = renderView->getViewPortRect().origin.y;
@@ -684,19 +692,19 @@ - (void)onUIKeyboardNotification:(NSNotification*)notif
         CGAffineTransformScale(CGAffineTransformIdentity, 1.0f / scaleX, 1.0f / scaleY));
 
     // Fill notification info for Axmol IME dispatcher
+    auto winSize = originalRect_.size;
+    CGSize viewSize = CGSizeMake(winSize.width * backingScaleFactor / scaleX,
+                                 winSize.height * backingScaleFactor / scaleY);
+    
     ax::IMEKeyboardNotificationInfo notiInfo;
-    notiInfo.begin    = ax::Rect(begin.origin.x, begin.origin.y, begin.size.width, begin.size.height);
-    notiInfo.end      = ax::Rect(end.origin.x, end.origin.y, end.size.width, end.size.height);
-    notiInfo.duration = (float)aniDuration;
+    notiInfo.begin = convertKeyboardRectToViewport(begin, viewSize);
+    notiInfo.end   = convertKeyboardRectToViewport(end, viewSize);
+    notiInfo.duration = aniDuration;
 
     ax::IMEDispatcher* dispatcher = ax::IMEDispatcher::sharedDispatcher();
     if (UIKeyboardWillShowNotification == type)
     {
         dispatcher->dispatchKeyboardWillShow(notiInfo);
-
-        // Move the whole render view up by keyboard height
-        CGFloat distance = end.size.height;
-        [self doAnimationWhenKeyboardMoveWithDuration:aniDuration distance:distance];
     }
     else if (UIKeyboardDidShowNotification == type)
     {
@@ -706,9 +714,6 @@ - (void)onUIKeyboardNotification:(NSNotification*)notif
     else if (UIKeyboardWillHideNotification == type)
     {
         dispatcher->dispatchKeyboardWillHide(notiInfo);
-
-        // Restore to original rect
-        [self doAnimationWhenKeyboardMoveWithDuration:aniDuration distance:0.0f];
     }
     else if (UIKeyboardDidHideNotification == type)
     {