Commit Graph

26 Commits

Author SHA1 Message Date
andyque d12a71f738 issue , refactor UILayoutDefine 2014-05-09 17:16:11 +08:00
andyque f070fc335f issue , refactor BrightStyle to strong typed enum 2014-05-09 15:23:34 +08:00
andyque 762e8d9249 issue , refactor WidgetType to strong typed enum 2014-05-09 15:16:33 +08:00
andyque 6a7277c38f issue , refactor TextureResType to strong typed enum 2014-05-09 14:56:05 +08:00
andyque 21e4d05e6e issue , refactor SEL_TouchEvent to std::function 2014-05-09 11:28:36 +08:00
andyque 1d7726133c issue , refactor enum SizeType to strong typed enum 2014-05-09 09:37:51 +08:00
andyque fd362d2ace issue . deprcated PositionType and make a new enum class instead 2014-05-08 18:25:49 +08:00
andyque 0c2fd977ea issue . add UIDeprecated.h and refactor FocusDirection to inner class of
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
andyque 05b7d274c8 issue . fix distance calculation 2014-05-07 18:27:05 +08:00
andyque def0505ba7 closed , refactor 2014-05-07 14:26:41 +08:00
andyque 1282252c25 closed , refactor 2014-05-07 14:06:44 +08:00
andyque ef70c684de issue , add requestFocus method and the layout current can get focus 2014-05-07 10:23:57 +08:00
andyque a15dd55baa closed , fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
andyque 9383900123 issue . cleanup some code of UILayout and UIWidget 2014-05-05 11:37:39 +08:00
andyque b35ddfe5b5 issue , add focus functionality into Widget class 2014-05-05 11:37:38 +08:00
andyque 1dee81a166 issue , refactor setFocused into setHilighted 2014-05-05 11:37:38 +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
CaiWenzhi 19f6526ef8 Widget supports contentsize 2014-04-17 14:08:25 +08:00
Huabing.Xu e2a24dec84 replace Point with Vector2 2014-04-15 18:08:29 +08:00
Huabing.Xu 071cbc7565 migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
Huabing.Xu b9af100493 visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
andyque 77aee27f05 issue . refactor ButtonReader 2014-04-04 16:51:07 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
James Chen f51c39c034 closed : 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
CaiWenzhi b8ce59962a Fixed bug of ScrollView 2014-03-13 10:11:41 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00