Commit Graph

438 Commits

Author SHA1 Message Date
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
zilongshanren 3e2094981f add scale9sprite rendering type test 2015-10-30 14:01:01 +08:00
zilongshanren f84c2de1e2 add sprite and scale9sprite batch test 2015-10-30 09:58:02 +08:00
zilongshanren 1417534194 add rendering type to scale9sprite 2015-10-29 23:13:36 +08:00
Neo Kim 543fff63fb PageView - Add indicators to some test cases 2015-10-28 17:23:08 +09:00
Neo Kim abc309edb2 PageView - Replace the deprecated APIs with new ones. 2015-10-28 16:57:54 +09:00
Neo Kim b9a4449494 PageView - Add `handleReleaseLogic()` for page view. 2015-10-28 16:56:35 +09:00
Neo Kim 97acf52cc8 PageView - Replace the legacy methods of `PageView` with the ones of `ListView`. 2015-10-28 16:56:34 +09:00
Neo Kim e567259826 PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`. 2015-10-28 16:56:34 +09:00
Neo Kim a09f2af14c PageView - Trivial change on test code 2015-10-28 16:56:34 +09:00
XiaoFeng 767a4afb9f Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1 2015-10-14 09:16:34 +08:00
zilongshanren bee52e378d fix ui::WebView callback operate OpenGL issue.
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
pandamicro 1eeafed072 Merge pull request #13884 from yangws/v3
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 16:32:56 +08:00
Vincent Yang 4b83240bed Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null. 2015-09-17 11:20:36 +08:00
andyque 1be5402050 Merge branch 'v3' into addiOSMultiline-support
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
andyque 556175df1e add iOS EditBox multiline support
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.

Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
Neo Kim 3fff195c20 Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary. 2015-09-13 22:32:22 +09:00
Neo Kim 22b2f8b7b3 ListView - Change the order of test cases and fix for windows builds. 2015-09-11 16:00:53 +09:00
Neo Kim e58c073186 ListView - Apply magnetic to inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim ca3ea53ffd ListView - Add enum for magnetic type and test cases for magnetic scroll. 2015-09-09 10:29:18 +09:00
Neo Kim d8fc04d109 ListView - Add 'scrollToItem' method and its test cases. 2015-09-09 10:29:18 +09:00
Neo Kim 2599271410 ListView - Add APIs which return the closest item in specific position in current view. 2015-09-09 10:29:17 +09:00
andyque c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +08:00
andyque 6cea66f932 fixed Scale9Sprite default capInset bug.
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
2015-08-25 23:31:34 +08:00
andyque 72496ae426 add missing ui test in Lua 2015-08-20 15:25:09 +08:00
子龙山人 f6569f24f4 Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
pandamicro 6644b06643 Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
WenhaiLin 772dab2002 Fixed minor problems in test cases. 2015-08-07 23:08:49 +08:00
andyque a35e89225e Re-implement Editbox on Android platform.
This PR also fixed issue:

https://github.com/cocos2d/cocos2d-x/issues/9572

For the new EditBox:

1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.

When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.

2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.

3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation.
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
andyque 5f34c1f072 add PageView vertical scroll support 2015-08-01 18:18:46 +08:00
pandamicro aed6b0719e Merge pull request #13089 from yangws/issue_12692
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
pandamicro c9d23805e7 Merge pull request #12978 from yangws/issue_12249
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-31 09:54:38 +08:00
Vincent Yang e1d4d22353 Fixed #12692 : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api
Fix PageView scrollToPage bug and the curPageIndex bug
2015-07-22 15:01:57 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
Vincent Yang f9e90f31f6 Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset. 2015-07-17 15:52:58 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
andyque 517221a0df add jumpToPage API to PageView.
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue.
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
2015-07-15 14:35:13 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
Neo Kim 3f05ad2b98 Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider
Improve ui::Slider
2015-06-29 17:01:27 +08:00
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
andyque 8f7b439dfe add cocostudio 1.6 tests 2015-06-25 18:06:45 +08:00
andyque 931011809d fixed unintended spaces in string 2015-06-23 10:38:43 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
andyque b8826d9de4 improve the enum naming 2015-06-16 09:42:06 +08:00
andyque c1108db31e Improve ui::Slider
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
2015-06-15 18:31:21 +08:00
andyque 56b7037c5f optimize uislider memory usage 2015-06-05 17:16:10 +08:00
andyque 6390f063fe optimize UILoadingBar memory usage 2015-06-05 15:57:39 +08:00
andyque a7141bab38 improve imageView memory usage 2015-06-05 14:19:05 +08:00
andyque 91ddb802e1 optimize ui::CheckBox memory consumption 2015-06-05 10:32:22 +08:00
Dale Stammen 736de4e37c fixed compiler warning for double to float conversion 2015-05-28 13:32:40 -07:00
andyque 74f0b3b436 add bmfont test 2015-05-27 16:58:52 +08:00
andyque 0352a7a3ea add Android 9-patch image format support
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date:   Mon May 18 17:16:09 2015 +0800

    Add Android 9-patch format support.

    Squashed commit of the following:

    commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 17:08:05 2015 +0800

        finish refactoring

    commit 730bf817f833de56999c616779fc0279890e14bf
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 11:47:08 2015 +0800

        refactoring 9-patch

    commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 09:42:06 2015 +0800

        refactor

    commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 17:59:21 2015 +0800

        fix lua and Android compile error

    commit 2877538fb3a436f95400b2ad637ea147b9df81d7
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 11:32:43 2015 +0800

         Add Android 9-patch image format support.

        The 9-patch format is used for creating Scale9Sprite.
2015-05-21 16:04:37 +08:00
samuele3hu 562c711cda Update CocoStudioUIEditorTest for Lua and replace some deprecated functions. 2015-05-15 18:26:21 +08:00
yusheng.lu 60190a1be6 changed csb names in ccs-res to shorter 2015-05-14 18:08:37 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
Dale Stammen 4d7e6567ea Use TextBMFont when text is updated from slider for faster performance 2015-04-27 19:48:15 -07:00
samuele3hu 47e2698986 Fix the cocos3.6beta0 bugs 2015-04-22 10:20:21 +08:00
minggo 3c7d5afce2 Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
Fix crash when play streamed MP4 file.
2015-04-16 18:16:28 +08:00
WenhaiLin fc75f46abb Fix crash when play streamed MP4 file. 2015-04-16 16:27:09 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
andyque 3c3d76fd9e remove listview focus test 2015-04-14 17:48:43 +08:00
andyque 10c90b06aa fix ui::Text outline don't change content size 2015-04-10 15:33:48 +08:00
andyque c8d8a0d220 add disableEffect API for ui::Text 2015-04-10 14:18:16 +08:00
Ricardo Quesada 23b0d4d2f6 more fixes with the namespaces 2015-04-08 21:23:47 -07:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3
no more USING_NS in the header files.
it creates conflict with xcode 6.3
2015-04-08 17:37:30 -07:00
WenhaiLin 0d51c13743 Make all test cases work fine with new test framework. 2015-04-03 14:31:03 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +08:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Huabing.Xu 29c4c744ac fix compile error on cpp-tests release mode 2015-01-28 15:34:28 +08:00
minggo 8d681dfe7d Merge pull request #10218 from andyque/fixIssue10183
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
2015-01-28 09:57:34 +08:00
minggo 880abfe814 Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
Fix loading bar reload texture issue
2015-01-27 13:50:38 +08:00
andyque 95e8072afa fixed issue #10183 2015-01-26 18:26:59 +08:00
andyque 12cf9da486 improve loadingbar test 2015-01-26 14:46:45 +08:00
andyque 0e67cfcbff improve loading Bar Test 2015-01-26 14:39:44 +08:00
andyque fdbf84a118 add uploading switch scale9 tests 2015-01-26 13:49:54 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
yusheng.lu bec9b0e6b3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-21 17:14:16 +08:00
yusheng.lu 304f28a58a Update the csb resources for current Cocos2d-x 2015-01-21 17:08:16 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
minggo 11ff48416f Merge pull request #10060 from doomsdayer/v3_layout_test
Updated the Layout Component demo
2015-01-21 11:11:44 +08:00
minggo dca1edccd7 Merge pull request #10113 from liamcindy/Scale9Error
update for ui object scale9 state refresh
2015-01-21 10:51:55 +08:00
Liam 902fba0638 fix slider and loadingbar scale9 error 2015-01-20 20:57:54 +08:00
yusheng.lu 858bafdae9 Removed the unused variable to make XCode compile pass. 2015-01-20 19:56:00 +08:00
WenhaiLin ef55ccdbeb Fixed UIEditBoxTest display error font size 2015-01-20 18:08:17 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
yusheng.lu bba8d6481f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test 2015-01-19 10:05:39 +08:00
minggo 45c4c16f93 Merge pull request #10010 from andyque/fixErrorFontName
fix font name typo in tests
2015-01-15 10:24:02 +08:00
andyque f8200347cd fix font name typo in tests 2015-01-15 10:10:53 +08:00
WenhaiLin 13b049a543 Fixed warns:truncation from double to float 2015-01-15 10:07:23 +08:00
yusheng.lu eb106d57a6 layout component test 2015-01-14 11:34:43 +08:00
andyque 32450ae9a3 fix empty http string 2015-01-12 16:16:39 +08:00
minggo 491d36c62b Merge pull request #9626 from liamcindy/CocoReader
update for cocos reader
2014-12-26 09:29:37 +08:00
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08:00
Liam 83fcf74882 update for code format 2014-12-24 10:56:01 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
Liam 2991b57ec6 update lay out reader and samples 2014-12-22 18:24:06 +08:00
Liam 8b32193e04 reset unused format changed 2014-12-22 15:15:40 +08:00
Liam 7c4d31feab update for lay out samples 2014-12-22 14:51:50 +08:00
yusheng.lu 7426a32d9f 1. ListView demo compeleted.
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
pipu 1cbc0120be Merge branch 'v3' into v3_flatbuffers 2014-12-01 22:56:18 +08:00
pipu 22b044805c Add callback parse 2014-12-01 21:50:05 +08:00
pipu 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
minggo e8cff91bd7 Merge pull request #9248 from andyque/fixTextIgnoreContentSizeIssue
Fix text ignore content size issue
2014-11-27 09:57:33 +08:00
Ricardo Quesada 1361f2c619 Director users a low-pass filter to display the FPS
FPS is more stable. Uses a 5% low-pass filter
2014-11-26 13:31:44 -08:00
andyque e118b085b8 add UIText bug fix tests 2014-11-26 15:05:20 +08:00
minggo b8bb61c7c6 Merge pull request #9028 from andyque/fixWidgetFlipIssue
Fix widget flip issue
2014-11-24 15:19:50 +08:00
andyque 8433127b45 finish tests 2014-11-07 11:11:51 +08:00
andyque 4bfa94b8c2 add button flip test 2014-11-07 11:11:51 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
Dale Stammen f2d9fd2746 enabled tests for winrt 2014-10-23 07:23:13 -07:00
Huabing.Xu ff27c3539d [ci skip] fix typo 2014-10-21 17:37:00 +08:00
pipu 8072328ca6 Modify that record path of .csb file 2014-10-20 11:56:48 +08:00
andyque 0dc7bbe861 fix long file path on WP8 2014-10-18 14:48:27 +08:00
andyque 952e52365b fix scrollView rotate issue 2014-10-17 14:02:49 +08:00
andyque 8161d2ad34 fix scrollView rotate issue 2014-10-17 11:31:00 +08:00
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
minggo 2db8217b09 Merge pull request #8543 from Dhilan007/v3-fixwarns
fix warns and memory leak
2014-10-11 16:07:54 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
andyque 59ff2fbf72 remove dead code 2014-10-10 18:08:25 +08:00
andyque 0f0c3878e5 add more indicator 2014-10-10 17:36:33 +08:00
andyque fb1adb5b90 add issue tests skeleton 2014-10-10 17:07:08 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
andyque da48649370 fix button title only content size issue 2014-10-10 11:01:51 +08:00
pipu ee624e47cc 1. Modifying UIScale9Sprite
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
Sergey Perepelitsa 094716a500 Scale9Sprite cropped frames tests 2014-09-28 01:58:26 +04:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32
web view win32
2014-09-22 09:30:29 +08:00
andyque 7615eb8d39 fix editbox test 2014-09-19 14:21:18 +08:00
Jeff 27919dad77 add simple implement of WebView for win32
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
2014-09-17 22:30:15 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00
andyque 0076953f97 fix iOS compile error 2014-09-01 15:55:09 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
andyque cd031c4493 Merge branch 'v3' into addWebView
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo 2fd6cf8f43 fix compiling error 2014-08-28 13:59:56 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08: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 4597de069d improve test case and make program more robust 2014-08-27 08:02:22 +08:00
andyque 9449152caf finish WebView Tests 2014-08-26 22:03:55 +08:00
andyque 15815118a2 finish android version 2014-08-26 16:53:37 +08:00
andyque e12db46866 fix style 2014-08-26 12:08:26 +08:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
minggo aba973b1ea Merge pull request #7834 from andyque/improveUI
add click event listener to all Widget classes
2014-08-22 14:00:10 +08:00
andyque 84cf0ee834 add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
andyque 3f51926c5d add click event listener to Widget 2014-08-21 10:21:07 +08:00
andyque 46f3ab9b57 add Scale9Sprite to create method of ui::EditBox 2014-08-20 16:08:28 +08:00
andyque a8ab1a85b7 fix linux compile error 2014-08-19 17:42:17 +08:00
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
andyque 0517ceb0dc add scrollView nested tests 2014-08-15 16:21:27 +08:00
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
minggo 8364e179a4 Merge pull request #7780 from andyque/addOptionsForHardCodedValue
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
andyque 18851d3e81 add customization to UIButton and UIPageView 2014-08-14 11:14:24 +08:00
minggo a88504b153 Merge pull request #7756 from andyque/fixTestCase
fix custom particle tests position
2014-08-14 09:44:16 +08:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
andyque e269ad49c1 fix custom particle tests position 2014-08-13 09:56:37 +08:00
andyque cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
andyque d00e3349a3 fixed loadingBar change direction affect position issue 2014-08-08 11:17:17 +08:00
andyque f44906d56c fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property 2014-08-05 08:11:37 +08:00
andyque 5af4657fbb fix windows utf8 source code file can not compile erorr 2014-08-01 21:20:27 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
2014-07-31 16:58:56 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
andyque f2b0528cc9 refactor 2014-07-30 10:45:35 +08:00
andyque 7abea5dc58 add utf8 support for UITextField 2014-07-30 10:34:37 +08:00
andyque 955da5d3cc move utf8_substr to ui::helper class. 2014-07-30 10:34:37 +08:00
andyque c5ca0dbf10 fix android and linux compile error 2014-07-29 16:24:27 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
minggo b2e705acd8 Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
fix remove self in Widget touch callback issue
2014-07-28 14:04:20 +08:00
andyque 7353f8685a Simplify Widget ContentSize cascade change algorithm 2014-07-25 14:59:58 +08:00
andyque e56e015be2 minor modification of tests 2014-07-25 14:40:58 +08:00
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
andyque 21f1624462 minor fix of RichText 2014-07-23 14:10:00 +08:00