andyque
|
df86b07f15
|
closed #5005, refactor
|
2014-05-14 09:23:56 +08:00 |
andyque
|
a28bdb0ed5
|
closed #5005, refactor
|
2014-05-13 18:41:38 +08:00 |
andyque
|
41fe56ee70
|
closed #5005, fix a null pointer exception
|
2014-05-13 17:12:48 +08:00 |
andyque
|
2d88c8ea92
|
closed #5005, fix visible and enable issue
|
2014-05-13 16:37:41 +08:00 |
andyque
|
1c47c833c6
|
issue #5005, fixed widget visit method
|
2014-05-13 14:56:44 +08:00 |
andyque
|
810c25b85e
|
Merge branch 'v3' into issue5005
|
2014-05-13 14:52:49 +08:00 |
andyque
|
1a319b3f12
|
issue #5005, deprecated setTouchEnabled
|
2014-05-13 14:52:27 +08:00 |
andyque
|
b2397f4059
|
issue #5005, fix widget hittest problem
|
2014-05-13 12:04:43 +08:00 |
andyque
|
a0a4df5ac5
|
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-12 18:00:54 +08:00 |
andyque
|
da3e794631
|
issue #5057, convert const char* to std::string&
|
2014-05-12 14:59:00 +08:00 |
andyque
|
0c0f18e7f3
|
issue #5047, refactor LayoutParameterType
|
2014-05-09 17:38:05 +08:00 |
andyque
|
451b7a1b6b
|
issue #5057, refactor UICheckBox event callback
|
2014-05-09 16:04:55 +08:00 |
andyque
|
f070fc335f
|
issue #5057, refactor BrightStyle to strong typed enum
|
2014-05-09 15:23:34 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
21e4d05e6e
|
issue #5057, refactor SEL_TouchEvent to std::function
|
2014-05-09 11:28:36 +08:00 |
andyque
|
1d7726133c
|
issue #5057, refactor enum SizeType to strong typed enum
|
2014-05-09 09:37:51 +08:00 |
andyque
|
fd362d2ace
|
issue #5057. deprcated PositionType and make a new enum class instead
|
2014-05-08 18:25:49 +08:00 |
andyque
|
0c2fd977ea
|
issue #5057. 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 #4861. fix distance calculation
|
2014-05-07 18:27:05 +08:00 |
andyque
|
def0505ba7
|
closed #4861, refactor
|
2014-05-07 14:26:41 +08:00 |
andyque
|
1282252c25
|
closed #4861, refactor
|
2014-05-07 14:06:44 +08:00 |
andyque
|
ef70c684de
|
issue #4861, add requestFocus method and the layout current can get focus
|
2014-05-07 10:23:57 +08:00 |
andyque
|
9d71ae29b9
|
issue #4861. fixed all widget focus diabled bug
|
2014-05-06 17:28:12 +08:00 |
andyque
|
a15dd55baa
|
closed #3861, fixed some typo and indent problem
|
2014-05-06 12:04:52 +08:00 |
andyque
|
2d0de93baf
|
issue #4861, fixed a widget bug and add VBox test
|
2014-05-05 11:37:40 +08:00 |
andyque
|
a7fbd590dc
|
issue #4861. add a horizontal focus test
|
2014-05-05 11:37:39 +08:00 |
andyque
|
9383900123
|
issue #4861. cleanup some code of UILayout and UIWidget
|
2014-05-05 11:37:39 +08:00 |
andyque
|
b35ddfe5b5
|
issue #4861, add focus functionality into Widget class
|
2014-05-05 11:37:38 +08:00 |
andyque
|
1dee81a166
|
issue #4861, 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
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +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 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +08:00 |
James Chen
|
177bf4df9d
|
Some warning fixes.
|
2014-03-14 15:38:43 +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 |