Liam
8d8215b148
override function for listview
2014-12-22 09:55:29 +08:00
andyque
16cf396ed7
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-16 16:44:04 +08:00
yusheng.lu
2f456a5668
ListViewReader completed and listview callback feature.
2014-12-05 19:31:10 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
andyque
d7b17c598d
fix potential crash when user remove self in widgets callback
2014-08-01 20:58:42 +08:00
andyque
e6b85fbd77
fix minor bugs of UISlider and remove unused header include in ListView
2014-07-30 16:55:16 +08:00
andyque
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
andyque
bd663ac55e
fix margin zero
2014-06-27 15:39:10 +08:00
andyque
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
minggo
e90e7699a6
Merge pull request #7195 from minggo/addChild-override
...
override addChild by name
2014-06-25 14:12:10 +08:00
minggo
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
andyque
78e119ef56
Merge branch 'v3' into fixTouchEvent
...
Conflicts:
cocos/ui/UIWidget.cpp
2014-06-25 11:10:51 +08:00
andyque
693ec0be29
fix listView Item move respond to click event
2014-06-25 10:50:18 +08:00
andyque
547ad379ae
closed #5589
2014-06-24 15:51:14 +08:00
andyque
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
andyque
808c4bd763
remove unused override method
2014-06-23 15:46:07 +08:00
andyque
c9bcbfb265
fix addEventListener hidden problem
2014-06-23 12:09:49 +08:00
andyque
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00
andyque
585ccf2c71
issue #5161 , replace all _size to _contentSize
2014-06-20 10:40:16 +08:00
andyque
7a25fbfe29
refactor touch event
2014-06-09 10:23:11 +08:00
andyque
c6cb3a56fb
refactor ListView, add do Layout
2014-06-04 10:51:32 +08:00
andyque
0518e494b1
add constness to UIListView
2014-05-27 11:30:35 +08:00
andyque
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
andyque
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
andyque
d612518421
fix ui widget copyProperties issue
2014-05-23 15:03:46 +08:00
andyque
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
andyque
c8d9ab8122
issue #5176 , refactor passTouchEventToParent method of UIWidget
2014-05-22 15:23:13 +08:00
andyque
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d22
, reversing
changes made to 6f2f2046c7
.
2014-05-20 14:36:29 +08:00
andyque
b434840bc9
issue #5183 , add layout parameter type to widget for convenient access
2014-05-16 10:33:28 +08:00
Ricardo Quesada
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
andyque
09fce798f0
closed #5110 , add const reference to typedef
2014-05-14 16:14:28 +08:00
andyque
a0a4df5ac5
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-12 18:00:54 +08:00
andyque
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
andyque
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
andyque
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
andyque
0c0f18e7f3
issue #5047 , refactor LayoutParameterType
2014-05-09 17:38:05 +08:00
andyque
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
Huabing.Xu
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
pipu
4c1cbabb5e
fixed bugs
2014-03-31 11:34:26 +08:00
CaiWenzhi
4d99736e4a
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
2014-03-12 17:06:48 +08:00
andyque
cbcc1bbbcf
let ios project compile correct
2014-03-11 18:48:26 +08:00