Merge pull request cocos2d#5 from drelaptop/v3-merge-android-cmake

V3 merge android cmake, fix error for network module

Author: newnon

.gitignore

@@ -154,3 +154,6 @@ tests/cpp-empty-test/proj.tizen/res/
 tests/cpp-tests/proj.tizen/res/
 tests/lua-empty-test/project/proj.tizen/res/
 tests/lua-tests/project/proj.tizen/res/
+
+# Ignore vscode folder
+.vscode/

cocos/CMakeLists.txt

@@ -126,6 +126,10 @@ elseif(MACOSX OR APPLE)
  FIND_LIBRARY(IOKIT_LIBRARY IOKit)
  FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
  FIND_LIBRARY(ICONV_LIBRARY iconv)
+ FIND_LIBRARY(GAME_CONTROLLER GameController)
+ 
+  # fix js-tests compile error, for temp
+  set_property(TARGET ${APP_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS "-fObjc")
 
   set(PLATFORM_SPECIFIC_LIBS
     ${COCOA_LIBRARY}
@@ -137,6 +141,7 @@ elseif(MACOSX OR APPLE)
     ${IOKIT_LIBRARY}
     ${FOUNDATION_LIBRARY}
     ${ICONV_LIBRARY}
+    ${GAME_CONTROLLER}
   )
 
 elseif(ANDROID)

cocos/base/CMakeLists.txt

@@ -2,6 +2,7 @@
 if(MACOSX OR APPLE)
   set(COCOS_BASE_SPECIFIC_SRC
     base/CCUserDefault-apple.mm
+    base/CCController-apple.mm
   )
 
 elseif(ANDROID)

cocos/network/CMakeLists.txt

@@ -18,6 +18,16 @@ if(ANDROID)
     network/CCDownloader-android.cpp
     network/Uri.cpp
   )
+elseif(MACOSX)
+  set(COCOS_NETWORK_SRC
+    network/CCDownloader-apple.mm
+    network/HttpClient.cpp
+    network/SocketIO.cpp
+    network/WebSocket.cpp
+    network/CCDownloader.cpp
+    network/CCDownloader-curl.cpp
+    network/Uri.cpp
+  )
 else()
   set(COCOS_NETWORK_SRC
     network/HttpClient.cpp

cocos/ui/UIEditBox/UIEditBoxImpl-android.h

@@ -63,7 +63,7 @@ class EditBoxImplAndroid : public EditBoxImplCommon
     virtual void setNativeInputMode(EditBox::InputMode inputMode) override;
     virtual void setNativeInputFlag(EditBox::InputFlag inputFlag) override;
     virtual void setNativeReturnType(EditBox::KeyboardReturnType returnType)override;
-    virtual void setNativeTextHorizontalAlignment(cocos2d::TextHAlignment alignment)override;
+    virtual void setNativeTextHorizontalAlignment(cocos2d::TextHAlignment alignment) override;
     virtual void setNativeText(const char* pText) override;
     virtual void setNativePlaceHolder(const char* pText) override;
     virtual void setNativeVisible(bool visible) override;

cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp

@@ -34,6 +34,10 @@
 
 static const int CC_EDIT_BOX_PADDING = 5;
 
+static cocos2d::Size applyPadding(const cocos2d::Size& sizeToCorrect) {
+    return cocos2d::Size(sizeToCorrect.width - CC_EDIT_BOX_PADDING * 2, sizeToCorrect.height);
+}
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
 #define PASSWORD_CHAR "*"
 #else
@@ -144,8 +148,7 @@ void EditBoxImplCommon::setInactiveText(const char* pText)
         _label->setString(pText);
     }
     // Clip the text width to fit to the text box
-    const auto& editBoxSize = _editBox->getContentSize();
-    const auto maxSize = applyPadding(cocos2d::Size(editBoxSize.width, editBoxSize.height));
+    const auto maxSize = applyPadding(_editBox->getContentSize());
     Size labelSize = _label->getContentSize();
     if(labelSize.width > maxSize.width || labelSize.height > maxSize.height)
     {
@@ -214,6 +217,7 @@ void EditBoxImplCommon::setTextHorizontalAlignment(cocos2d::TextHAlignment align
 {
     _alignment = alignment;
     this->setNativeTextHorizontalAlignment(alignment);
+    refreshLabelAlignment();
 }
 
 void EditBoxImplCommon::setInputFlag(EditBox::InputFlag inputFlag)
@@ -413,11 +417,6 @@ void EditBoxImplCommon::editBoxEditingChanged(const std::string& text)
 
 }
 
-Size ui::EditBoxImplCommon::applyPadding(const Size& sizeToCorrect) const {
-  constexpr auto paddingLeftRight = CC_EDIT_BOX_PADDING * 2;
-  return Size(sizeToCorrect.width - paddingLeftRight, sizeToCorrect.height);
-}
-
 NS_CC_END
 
 

cocos/ui/UIEditBox/UIEditBoxImpl-common.h

@@ -135,8 +135,6 @@ class CC_GUI_DLL EditBoxImplCommon : public EditBoxImpl
     void         refreshLabelAlignment();
     void         placeInactiveLabels(const Size& size);
     virtual void doAnimationWhenKeyboardMove(float duration, float distance)override {};
-
-    Size applyPadding(const Size& size) const;
 
     Label* _label;
     Label* _labelPlaceHolder;

plugin

@@ -0,0 +1 @@
+Subproject commit 0fb74e5ad6d5ffd8a4a243b0bfbfac4edc59098f

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

@@ -307,65 +307,35 @@ void UIEditBoxTestToggleVisibility::editBoxReturn(ui::EditBox* editBox)
 
 // UIEditBoxTestTextHorizontalAlignment
 
-bool UIEditBoxTestTextHorizontalAlignment::init()
-{
-    if (UIScene::init())
-    {
-        auto glview = Director::getInstance()->getOpenGLView();
-        auto visibleOrigin = glview->getVisibleOrigin();
-        auto visibleSize = glview->getVisibleSize();
-
-        auto pBg = Sprite::create("Images/HelloWorld.png");
-        pBg->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height/2));
-        addChild(pBg);
-
-        auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
-
-        // top
-        std::string pNormalSprite = "extensions/green_edit.png";
-        ui::EditBox* editName = ui::EditBox::create(editBoxSize + Size(0,40), ui::Scale9Sprite::create(pNormalSprite));
-        editName->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height*3/4));
-        editName->setFontColor(Color3B::RED);
-        editName->setPlaceHolder("Name:");
-        editName->setPlaceholderFontColor(Color3B::WHITE);
-        editName->setMaxLength(8);
-        editName->setFontSize(editBoxSize.height/2);
-        editName->setTextHorizontalAlignment(TextHAlignment::LEFT);
-        editName->setText("v👐👊💝");
-        editName->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
-        addChild(editName);
-
-        // middle
-        ui::EditBox* editPassword = ui::EditBox::create(editBoxSize, "extensions/orange_edit.png");
-        editPassword->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/2));
-        editPassword->setFontColor(Color3B::GREEN);
-        editPassword->setPlaceHolder("Password:");
-        editPassword->setMaxLength(6);
-        editPassword->setInputFlag(ui::EditBox::InputFlag::PASSWORD);
-        editPassword->setInputMode(ui::EditBox::InputMode::SINGLE_LINE);
-        editPassword->setFontSize(editBoxSize.height/2);
-        editPassword->setTextHorizontalAlignment(TextHAlignment::CENTER);
-        addChild(editPassword);
-
-        // bottom
-        // Add an intermediate Node to test scaling and content size relative to world
-        Node* editEmailParent = Node::create();
-//        _editEmailParent->setScale(0.5);
-        editEmailParent->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/4));
-        addChild(editEmailParent);
-
-        auto bottomButtonSize = Size(editBoxSize.width, editBoxSize.height + 10);
-        ui::EditBox* editEmail = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png");
-        editEmail->setPlaceHolder("Email:");
-        editEmail->setInputMode(ui::EditBox::InputMode::EMAIL_ADDRESS);
-        editEmail->setVisible(true);
-        editEmailParent->addChild(editEmail);
-        //It is required to use setFontSize and setContentSize after adding it to the hierarchy, so that native EditBox get the right size
-        editEmail->setFontSize(30);
-        editEmail->setContentSize(bottomButtonSize);
-        editEmail->setTextHorizontalAlignment(TextHAlignment::RIGHT);
-
-        return true;
+bool UIEditBoxTestTextHorizontalAlignment::init() {
+    if (!UIScene::init()) {
+      return false;
     }
-    return false;
+  
+    const auto glview = Director::getInstance()->getOpenGLView();
+    const auto visibleOrigin = glview->getVisibleOrigin();
+    const auto visibleSize = glview->getVisibleSize();
+    const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
+  
+    const auto createEditBox = [this, editBoxSize, visibleOrigin, visibleSize](const std::string& text,
+                                      const TextHAlignment alignment,
+                                      const int position_y) {
+        ui::EditBox* editbox = ui::EditBox::create(editBoxSize + Size(0,40), ui::Scale9Sprite::create("extensions/green_edit.png"));
+        editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, position_y));
+        editbox->setFontColor(Color3B::RED);
+        editbox->setPlaceHolder(text.c_str());
+        editbox->setPlaceholderFontColor(Color3B::WHITE);
+        editbox->setMaxLength(8);
+        editbox->setFontSize(editBoxSize.height/2);
+        editbox->setText(text.c_str());
+        editbox->setTextHorizontalAlignment(alignment);
+        editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
+        addChild(editbox);
+    };
+  
+    createEditBox("left alignment", TextHAlignment::LEFT, visibleOrigin.y+visibleSize.height*3/4);
+    createEditBox("center alignment", TextHAlignment::CENTER, visibleOrigin.y+visibleSize.height/2);
+    createEditBox("right alignment", TextHAlignment::RIGHT, visibleOrigin.y+visibleSize.height/4);
+  
+    return true;
 }