Commit Graph

421 Commits

Author SHA1 Message Date
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
James Chen a75432ec35 Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
samuele3hu a9a1e7cb2f Remove hard codes 2014-04-16 16:08:26 +08:00
samuele3hu 4c9fb311da Remove hard codes 2014-04-16 16:04:33 +08:00
samuele3hu edc4dde15f fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua 2014-04-16 15:31:44 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
Huabing.Xu e351b778c1 migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
Huabing.Xu 071cbc7565 migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
Mazyad Alabduljaleel b369c24f01 + [NEW]: setting the font for Editbox text
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
2014-04-13 00:19:14 +04:00
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
koowolf b5433f05c1 replace LabelTTF with Label 2014-04-10 16:51:25 +08:00
koowolf aa51e5dd22 fix compiler error in wp8 2014-04-10 15:15:17 +08:00
James Chen 0c3c29b50d Remove unused comments in CCEditBoxImplIOS.mm 2014-04-10 11:22:55 +08:00
James Chen 150e73ba62 Merge commit 'refs/pull/6197/head' of git://github.com/cocos2d/cocos2d-x into pull/6197 2014-04-10 11:21:16 +08:00
James Chen efb443dea0 Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
issue #4729: Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
Huabing.Xu 231cdcb906 adjust comment message 2014-04-10 11:14:46 +08:00
Dhilan007 390685ae93 Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
Dhilan007 05b8123803 Label:Makes the create functions of Label just do one thing. 2014-04-09 23:31:05 +08:00
Dhilan007 76689cda1a fixed compile errors. 2014-04-09 21:40:10 +08:00
Dhilan007 67652357e1 1.Makes the create functions of Label clear. 2014-04-09 21:35:08 +08:00
Anton Sokolchenko e98e4c403f Potential leak of an object stored into "self"
1. By executing 314: _systemControl = [[CCEditBoxImplIOS_objc alloc] initWithFrame:rect editBox:this];
2. We entered to the function 67: -(id) initWithFrame: (CGRect) frameRect editBox: (void*) editBox
3. Then 69: "self = [super init];" returns object with +1 retain count
4. 93: "return nil" Potential leak of an object stored into "self".
2014-04-09 12:00:15 +03:00
Huabing.Xu b9af100493 visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
Huabing.Xu 29c345bd02 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-04 18:45:21 +08:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
Huabing.Xu bb19e39e37 migrate ScrollView to director matrix stack 2014-04-03 15:55:37 +08:00
andyque 0a6b0a4389 issue #4636. refactor Scale9Sprite 2014-04-03 10:07:47 +08:00
Ryeeeeee 432ec49c88 fix issue that ControlButton can't swallow touch event. 2014-04-02 17:01:11 +08:00
James Chen 48839b9d4d closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
Dale Stammen 9f68a1111e added wp8 editbox support 2014-03-28 16:03:09 -07:00
Dhilan007 898e2136b1 LabelTTF and LabelBMFont tagged as deprecated 2014-03-28 14:18:01 +08:00
Dhilan007 fd5a4acddb Remove the old implementation of LabelBMFont. 2014-03-28 10:28:44 +08:00
andyque 57d8f155df issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
minggo a374241f65 Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
Windows Phone 8,0 cocos2d-x 3.0  changes
2014-03-26 13:58:46 +08:00
James Chen 8d28884c9f Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel
issue #3821: Uses new label instead of LabelTTF in engine.
2014-03-25 13:46:17 +08:00
Dale Stammen 04b529d328 fixed use of nullptr in variable args for wp8 2014-03-24 15:09:24 -07:00
Dale Stammen 44e6efea64 #pragma mark for ios and mac only 2014-03-22 06:08:05 -07:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.
2014-03-21 13:44:29 +08:00
James Chen f7e003758f issue #4448: Respond to move event if dragging is enabled, no matter whether mouse is in the content of cocos2d::extension::ScrollView. 2014-03-19 17:11:34 +08:00
James Chen 02ee3a52eb closed #4448: Elastic bounce back effect support for cocos2d::extension::ScrollView. 2014-03-19 17:11:34 +08:00
Jeong YunWon 2f1a7ebf42 Elastic bounceback for ScrollView
Add iOS-like elastic bounceback.
If you scroll content of scroll view out of insets,
its content will be scrolled 0.35 of user scrolled distance.
2014-03-18 18:51:07 +09:00
Dhilan007 e512235299 Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
Dhilan007 cea307bfb8 EditBox:fixed nothing to display when input flag is PASSWORD on Android. 2014-03-13 22:16:38 +08:00
James Chen 1595465361 Merge pull request #5736 from Dhilan007/develop_editbox
EditBox:fixed clip the text width to fit to the text box on Android and IOS.
2014-03-13 18:36:48 +08:00
dingpinglv a567d467b3 Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback. 2014-03-13 10:14:24 +08:00
Dhilan007 9c9d2c24bf EditBox:fixes clip the text width to fit to the text box on Android and IOS. 2014-03-12 21:40:58 +08:00
James Chen a393eded58 CCLOG -> CCLOGINFO for change of EditBox's position. 2014-03-12 14:16:42 +08:00
James Chen 08ce108454 Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since After re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now.
We need to fix this as soon as possible.
2014-03-12 14:12:07 +08:00
koowolf 0aaa1dc0db closed #4291:open CCEditBox as modal dialog 2014-03-06 22:17:20 +08:00