V4 editbox globalz fix

cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp

@@ -9530,53 +9530,6 @@ int lua_register_cocos2dx_studio_ArmatureAnimation(lua_State* tolua_S)
     return 1;
 }
 
-int lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas(lua_State* tolua_S)
-{
-    int argc = 0;
-    cocostudio::ArmatureDataManager* cobj = nullptr;
-    bool ok  = true;
-
-#if COCOS2D_DEBUG >= 1
-    tolua_Error tolua_err;
-#endif
-
-
-#if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(tolua_S,1,"ccs.ArmatureDataManager",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    cobj = (cocostudio::ArmatureDataManager*)tolua_tousertype(tolua_S,1,0);
-
-#if COCOS2D_DEBUG >= 1
-    if (!cobj) 
-    {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'", nullptr);
-        return 0;
-    }
-#endif
-
-    argc = lua_gettop(tolua_S)-1;
-    if (argc == 0) 
-    {
-        if(!ok)
-        {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'", nullptr);
-            return 0;
-        }
-        const cocos2d::Map<std::string, cocostudio::AnimationData *>& ret = cobj->getAnimationDatas();
-        ccmap_string_key_to_luaval(tolua_S, ret);
-        return 1;
-    }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getAnimationDatas",argc, 0);
-    return 0;
-
-#if COCOS2D_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'.",&tolua_err);
-#endif
-
-    return 0;
-}
 int lua_cocos2dx_studio_ArmatureDataManager_removeAnimationData(lua_State* tolua_S)
 {
     int argc = 0;
@@ -10350,6 +10303,53 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocostudio::ArmatureDataManager* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ccs.ArmatureDataManager",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocostudio::ArmatureDataManager*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'", nullptr);
+            return 0;
+        }
+        const cocos2d::Map<std::string, cocostudio::AnimationData *>& ret = cobj->getAnimationDatas();
+        ccmap_string_key_to_luaval(tolua_S, ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getAnimationDatas",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_studio_ArmatureDataManager_isAutoLoadSpriteFile(lua_State* tolua_S)
 {
     int argc = 0;
@@ -10550,7 +10550,6 @@ int lua_register_cocos2dx_studio_ArmatureDataManager(lua_State* tolua_S)
     tolua_cclass(tolua_S,"ArmatureDataManager","ccs.ArmatureDataManager","cc.Ref",nullptr);
 
     tolua_beginmodule(tolua_S,"ArmatureDataManager");
-        tolua_function(tolua_S,"getAnimationDatas",lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas);
         tolua_function(tolua_S,"removeAnimationData",lua_cocos2dx_studio_ArmatureDataManager_removeAnimationData);
         tolua_function(tolua_S,"addArmatureData",lua_cocos2dx_studio_ArmatureDataManager_addArmatureData);
         tolua_function(tolua_S,"addArmatureFileInfo",lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo);
@@ -10565,6 +10564,7 @@ int lua_register_cocos2dx_studio_ArmatureDataManager(lua_State* tolua_S)
         tolua_function(tolua_S,"getArmatureDatas",lua_cocos2dx_studio_ArmatureDataManager_getArmatureDatas);
         tolua_function(tolua_S,"removeTextureData",lua_cocos2dx_studio_ArmatureDataManager_removeTextureData);
         tolua_function(tolua_S,"addTextureData",lua_cocos2dx_studio_ArmatureDataManager_addTextureData);
+        tolua_function(tolua_S,"getAnimationDatas",lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas);
         tolua_function(tolua_S,"isAutoLoadSpriteFile",lua_cocos2dx_studio_ArmatureDataManager_isAutoLoadSpriteFile);
         tolua_function(tolua_S,"addSpriteFrameFromFile",lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile);
         tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_studio_ArmatureDataManager_destroyInstance);

cocos/ui/UIEditBox/UIEditBox.cpp

@@ -880,6 +880,15 @@ void EditBox::keyboardDidHide(IMEKeyboardNotificationInfo& /*info*/)
 
 }
 
+void EditBox::setGlobalZOrder(float globalZOrder)
+{
+    Widget::setGlobalZOrder(globalZOrder);
+    if (_editBoxImpl)
+    {
+        _editBoxImpl->setGlobalZOrder(globalZOrder);
+    }
+}
+
 #if CC_ENABLE_SCRIPT_BINDING
 void EditBox::registerScriptEditBoxHandler(int handler)
 {

cocos/ui/UIEditBox/UIEditBox.h

@@ -648,6 +648,8 @@ namespace ui {
          */
         virtual void keyboardDidHide(IMEKeyboardNotificationInfo& info) override;
 
+        void setGlobalZOrder(float globalZOrder) override;
+
         void openKeyboard() const;
 
     protected:

cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp

@@ -96,12 +96,14 @@ void EditBoxImplCommon::initInactiveLabels(const Size& size)
     _label->setAnchorPoint(Vec2(0.0f,1.0f));
     _label->setOverflow(Label::Overflow::CLAMP);
     _label->setVisible(false);
+    _label->setGlobalZOrder(_editBox->getGlobalZOrder());
     _editBox->addChild(_label, kLabelZOrder);
 
     _labelPlaceHolder = Label::create();
     _labelPlaceHolder->setAnchorPoint(Vec2(0.0f, 1.0f));
     _labelPlaceHolder->setTextColor(Color4B::GRAY);
     _labelPlaceHolder->enableWrap(false);
+    _labelPlaceHolder->setGlobalZOrder(_editBox->getGlobalZOrder());
     _editBox->addChild(_labelPlaceHolder, kLabelZOrder);
 
     setFont(pDefaultFontName, size.height*2/3);
@@ -238,7 +240,7 @@ void EditBoxImplCommon::refreshInactiveText()
 
     refreshLabelAlignment();
     if (!_editingMode) {
-        if (_text.size() == 0) {
+        if (_text.empty()) {
             _label->setVisible(false);
             _labelPlaceHolder->setVisible(true);
         } else {
@@ -291,6 +293,19 @@ void EditBoxImplCommon::setContentSize(const Size& size)
     placeInactiveLabels(_contentSize);
 }
 
+void EditBoxImplCommon::setGlobalZOrder(float globalZOrder)
+{
+    if (_label)
+    {
+        _label->setGlobalZOrder(globalZOrder);
+    }
+
+    if (_labelPlaceHolder)
+    {
+        _labelPlaceHolder->setGlobalZOrder(globalZOrder);
+    }
+}
+
 void EditBoxImplCommon::draw(Renderer* /*renderer*/, const Mat4& /*transform*/, uint32_t flags)
 {
     if(flags)
@@ -300,7 +315,7 @@ void EditBoxImplCommon::draw(Renderer* /*renderer*/, const Mat4& /*transform*/,
     }
 }
 
-void EditBoxImplCommon::onEnter(void)
+void EditBoxImplCommon::onEnter()
 {
     const char* pText = getText();
     if (pText) {

cocos/ui/UIEditBox/UIEditBoxImpl-common.h

@@ -91,6 +91,7 @@ class CC_GUI_DLL EditBoxImplCommon : public EditBoxImpl
 
     virtual void setAnchorPoint(const Vec2& anchorPoint) override {}
     virtual void setPosition(const Vec2& pos) override {}
+    virtual void setGlobalZOrder(float globalZOrder) override;
 
     /**
      * @js NA

cocos/ui/UIEditBox/UIEditBoxImpl.h

@@ -86,7 +86,8 @@ namespace cocos2d {
             virtual void setVisible(bool visible) = 0;
             virtual void setContentSize(const Size& size) = 0;
             virtual void setAnchorPoint(const Vec2& anchorPoint) = 0;
-
+            virtual void setGlobalZOrder(float globalZOrder) = 0;
+
             /**
              * check the editbox's position, update it when needed
              */

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp

@@ -36,6 +36,7 @@ UIEditBoxTests::UIEditBoxTests()
     ADD_TEST_CASE(UIEditBoxTestToggleVisibility);
     ADD_TEST_CASE(UIEditBoxTestTextHorizontalAlignment);
     ADD_TEST_CASE(UIEditBoxTestPressedAndDisabled);
+    ADD_TEST_CASE(UIEditBoxTestGlobalZ);
 }
 
 // UIEditBoxTest
@@ -377,3 +378,53 @@ bool UIEditBoxTestPressedAndDisabled::init() {
 
     return true;
 }
+
+// UIEditBoxTestGlobalZ
+bool UIEditBoxTestGlobalZ::init()
+{
+    if (!UIScene::init()) {
+        return false;
+    }
+
+    auto glview = Director::getInstance()->getOpenGLView();
+    auto visibleOrigin = glview->getVisibleOrigin();
+    auto visibleSize = glview->getVisibleSize();
+    const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
+
+    ui::EditBox* editbox = ui::EditBox::create(editBoxSize + Size(0, 40), "extensions/yellow_edit.png", "extensions/orange_edit.png");
+    editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height * 3 / 4));
+    editbox->setFontColor(Color3B::GREEN);
+    editbox->setPlaceHolder("Test Pressed Image");
+    editbox->setPlaceholderFontColor(Color3B::WHITE);
+    editbox->setPlaceholderFontSize(editBoxSize.height / 2);
+    editbox->setFontSize(editBoxSize.height / 2);
+    editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
+    editbox->setGlobalZOrder(100);
+    addChild(editbox);
+
+    editbox = ui::EditBox::create(editBoxSize + Size(0, 40), "extensions/yellow_edit.png", "extensions/orange_edit.png", "extensions/green_edit.png");
+    editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 2));
+    editbox->setFontColor(Color3B::GREEN);
+    editbox->setPlaceHolder("Test Disabled Image - green");
+    editbox->setPlaceholderFontColor(Color3B::WHITE);
+    editbox->setPlaceholderFontSize(editBoxSize.height / 2);
+    editbox->setFontSize(editBoxSize.height / 2);
+    editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
+    editbox->setGlobalZOrder(100);
+    addChild(editbox);
+    editbox->setEnabled(false);
+
+    editbox = ui::EditBox::create(editBoxSize + Size(0, 40), "extensions/yellow_edit.png");
+    editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 4));
+    editbox->setFontColor(Color3B::GREEN);
+    editbox->setPlaceHolder("Disabled Gray effect");
+    editbox->setPlaceholderFontColor(Color3B::WHITE);
+    editbox->setPlaceholderFontSize(editBoxSize.height / 2);
+    editbox->setFontSize(editBoxSize.height / 2);
+    editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
+    editbox->setGlobalZOrder(100);
+    addChild(editbox);
+    editbox->setEnabled(false);
+
+    return true;
+}

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.h

@@ -86,4 +86,11 @@ class UIEditBoxTestPressedAndDisabled : public UIScene
     virtual bool init() override;
 };
 
+class UIEditBoxTestGlobalZ : public UIScene
+{
+public:
+    CREATE_FUNC(UIEditBoxTestGlobalZ);
+    virtual bool init() override;
+};
+
 #endif /* defined(__cocos2d_tests__UIEditBoxTest__) */