Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,317 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1376 Commits

Author SHA1 Message Date
zilongshanren ea5dacedd0 Merge pull request #14608 from xiaofeng11/v3_310fix 
Bug fix & make test case more clear.
 2015-12-08 18:05:36 +08:00
XiaoFeng 73d0f8a46e Bug fix & make test case more clear. 
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
 2015-12-07 18:36:28 +08:00
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
enh a318e31222 We should not intercept touch event if scrollview's _direction is NONE 2015-12-06 22:51:22 +08:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
mogemimi 09c6e5d2f7 Replace 'Disabeld' with 'Disabled' 2015-12-05 18:59:54 +09:00
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d 
Combine Studio change for 2d components
 2015-12-04 16:05:24 +08:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00
zilongshanren 73d00b9262 fix scale9sprite be culled unexpectedly 
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
 2015-12-03 17:53:02 +08:00
fnz 8c691430c1 conflicts resolved 2015-11-27 13:19:10 +03:00
fnz c4b995fe59 updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
zilongshanren c50d686319 Merge pull request #14493 from xiaofeng11/v3_button 
Fix button texture loaded mark has set to wrong value bug
 2015-11-26 21:45:47 +08:00
zilongshanren c3604aa865 Merge pull request #14470 from zilongshanren/fixListViewClippingIssue 
Fix list view clipping issue
 2015-11-26 13:51:51 +08:00
XiaoFeng d744c167b7 Fix button texture loaded mark has set to wrong value bug 2015-11-26 13:49:32 +08:00
XiaoFeng eb47d28266 Change component resource load logic, won't dependent on sprite edit in other studio combine PR 2015-11-25 20:07:50 +08:00
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui 
Combine Studio change for UI components
 2015-11-25 17:19:54 +08:00
zilongshanren 759c0bbf31 rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
zilongshanren 5fef088695 refactor stencil state management code 2015-11-25 14:14:17 +08:00
XiaoFeng 27f6d6a6ba Remove condition macro check. 2015-11-24 19:17:38 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
XiaoFeng 23d8b63fca update header file to fix studio UI js binding compile error 2015-11-23 11:41:42 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
zilongshanren 9328a7c1d0 fix scalesprite opacity issue. 
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
 2015-11-20 17:35:29 +08:00
Neo Kim 4829a037f7 Fix #14440 2015-11-20 15:57:26 +09:00
zilongshanren 7ea90c2d41 Merge pull request #14033 from m-yukio/feature/fixed-richtext 
Support the new line element. Fixed a problem of UIRichText.
 2015-11-19 11:05:08 +08:00
Jeff Wang 9cbcd00798 some properties should be set 2015-11-18 22:47:26 +08:00
zilongshanren 02b59f020e Fix onEndEditing issue in script. 
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
 2015-11-18 15:05:13 +08:00
XiaoFeng bb83fe4596 Combine Studio change for UI components 2015-11-18 13:38:29 +08:00
zilongshanren 5d8cfa889c Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview 
Change PageView to derive from ListView
 2015-11-17 12:02:10 +08:00
zilongshanren 0b3a342222 Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets 
Set focus for widgets
 2015-11-17 11:24:27 +08:00
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
XiaoFeng e3c120eef4 Combine Studio change for compatible with 32 bit Mac System 2015-11-16 18:25:26 +08:00
Neo Kim 603d788fbf PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
Neo Kim b0ae23d567 PageView - Add more comments 2015-11-15 22:49:42 +09:00
Neo Kim ad134a6363 PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`. 2015-11-15 22:49:42 +09:00
Neo Kim 94637bef2f PageView - Change to keep some of the original API names because it makes more sense. 2015-11-10 21:35:01 +09:00
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
Neo Kim 049607b5d8 Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
Jeff Wang c1a64e9243 new implementation of EditBoxImpl-win32 2015-11-06 02:14:34 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +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
zilongshanren 7c82f9fe88 cache slice sprite calculation 2015-10-29 21:53:58 +08:00
zilongshanren 9a14ad5b14 fix a small bug related to non slice anchorPoint 2015-10-29 14:27:27 +08:00
zilongshanren ccf4cb5a74 improve scale9sprite 2015-10-29 10:41:58 +08:00
Neo Kim e59b7b74be PageView - Add `scrollToItem()` having only one parameter. 2015-10-28 16:57:54 +09:00
Neo Kim 69b794d284 PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled. 2015-10-28 16:57:53 +09:00
Neo Kim 9ed617c978 PageView - Add API descriptions 2015-10-28 16:56:36 +09:00
Neo Kim b72e4118f0 PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
Neo Kim e3fcd6722a PageViewIndicator - Add some getter and setters. 2015-10-28 16:56:36 +09:00
Neo Kim 8abd1ab600 PageView - The indicator should be created before `ListView::init()` 2015-10-28 16:56:36 +09:00
Neo Kim 2d2d17172c PageViewIndicator - Fix that indexes were upside down in vertical view. 2015-10-28 16:56:36 +09:00
Neo Kim 1897051664 PageView - Add `setDirection()` and `setIndicatorEnabled()` methods. 2015-10-28 16:56:36 +09:00
Neo Kim eefdffc032 PageViewIndicator - Add `setDirection()` method. 2015-10-28 16:56:36 +09:00
Neo Kim 368a3048c4 PageView - Add `setIndicatorPosition()`. 2015-10-28 16:56:36 +09:00
Neo Kim fc0fe976f7 PageView - Complete `handleReleaseLogic()` method. 2015-10-28 16:56:36 +09:00
Neo Kim b19ed5a3b5 ScrollView - Change `moveInnerContainer()` to virtual method. 2015-10-28 16:56:36 +09:00
Neo Kim b3f33de071 ListView - Change `calculateItemDestination()` to a class method. 2015-10-28 16:56:35 +09:00
Neo Kim c684016ee6 PageView - Implementing page view indicator 2015-10-28 16:56:35 +09:00
Neo Kim 4dbfb79110 Add `onItemListChanged()`method. 2015-10-28 16:56:35 +09:00
Neo Kim 0ee09fcfce PageView - Implement the page indicator 2015-10-28 16:56:35 +09:00
Neo Kim 30e2e46f20 PageView - Add `PageViewIndicator` which indicates current page among total pages. 2015-10-28 16:56:35 +09:00
Neo Kim 76acb91861 Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places. 2015-10-28 16:56:35 +09:00
Neo Kim a2bc0d4859 ScrollViewBar - Change wording in comment. 2015-10-28 16:56:35 +09:00
Neo Kim b9a4449494 PageView - Add `handleReleaseLogic()` for page view. 2015-10-28 16:56:35 +09:00
Neo Kim 46c0a43105 ScrollView - Use a vector in `scrollChildren()` instead of two floats. 2015-10-28 16:56:35 +09:00
Neo Kim 84d0625b93 ScrollView - Remove redundant codes. 2015-10-28 16:56:34 +09:00
Neo Kim 5de6aa78ec ScrollView - Remove the return value of `scrollChildren()`. 2015-10-28 16:56:34 +09:00
Neo Kim 30d39af5fa Refactor `jumpTo` methods to use `moveInnerContainer()`. 2015-10-28 16:56:34 +09:00
Neo Kim e67250e162 ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one. 2015-10-28 16:56:34 +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
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
dimon4eg 27d5ad920e Update comment 2015-10-21 16:55:45 +03:00
dimon4eg 82bcbb0325 Revert: Fix crash in web view on android 2015-10-21 16:54:41 +03:00
dimon4eg d317cd75e1 Improved code a bit 2015-10-16 11:28:34 +03:00
dimon4eg ee3c000b43 Fix crash in web view on android 2015-10-15 16:43:53 +03:00
XiaoFeng a6a3e24fdd Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display. 2015-10-14 13:58:58 +08:00
mogemimi daa29752db Fix typo in UIEditBox 2015-10-12 13:57:50 +09:00
pandamicro c2571f950c Merge pull request #14003 from zilongshanren/fixWebViewCallback 
fix ui::WebView callback operate OpenGL issue.
 2015-10-10 11:32:02 +08:00
pandamicro 27fc6b24ee Merge pull request #14080 from 1scaR1/v3 
Fixed enabling of scale9 background in ccui.Layout
 2015-10-10 09:39:09 +08:00
mogemimi 5993304e06 Fix typos 2015-10-09 17:59:11 +09:00
子龙山人 cdf6fa8a54 Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue 
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
 2015-10-09 08:27:18 +08:00
pandamicro e32e8b95a4 Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar 
fix crash in LoadingBar
 2015-10-08 11:22:43 +08:00
Nikita 0042f9f5cd Fixed background size if scale9 enabled in Layout 
Fixes for issue: cocos2d#14001
 2015-10-06 16:14:47 +03:00
pandamicro 1e298a2c1a Merge pull request #14064 from MSOpenTech/v3-win10-fix 
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
 2015-10-04 10:53:52 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +09:00
dimon4eg ec20b48775 fix crash in LoadingBar 2015-09-30 13:04:13 +03:00
dimon4eg fe8c1a12b5 Fix for text field 2015-09-30 12:39:44 +03:00
dimon4eg 2785a4313f Set focus for widgets 2015-09-30 12:31:33 +03:00
Neo Kim 423cbb83a9 Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable. 2015-09-30 16:55:48 +09:00
Yukio Murakami bc4bd99863 Support the new line element. Fixed a problem that protrude from the drawing area. 2015-09-28 14:47:09 +09: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
XiaoFeng f5c88c32af Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent 2015-09-23 10:55:01 +08:00
pandamicro eec67ea13b Merge pull request #13975 from zilongshanren/fixIssue11259 
don't change Text's dimension when label scale.
 2015-09-22 01:49:20 +08:00
子龙山人 f2190c79b9 Merge pull request #13835 from neokim/add_jump_to_item_to_listview 
Add a feature of jumping to a specific item in list tview
 2015-09-21 18:36:05 +08:00
zilongshanren fd8cfd8ccb don't change Text's dimension when label scale. 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
 2015-09-21 17:03:29 +08:00
Neo Kim b09a0bd0e3 Add a missing parameter in comment for document. 2015-09-21 17:07:32 +09:00
hanxi b1ed1a8a51 add UIEditBox support linux platform. 2015-09-18 17:11:58 +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
Neo Kim d9be26cd98 Use another dirty flag for list view layout other than 'Layout::_doLayoutDirty' because 'Layout::onEnter()' forces '_doLayoutDirty' to be true always. List view should have a way not to do layout in 'onEnter()'. 2015-09-16 16:21:11 +09:00
Mazyad Alabduljaleel 3090599f83 Oops, committed duplicate code by mistake 2015-09-16 10:12:07 +03:00
Mazyad Alabduljaleel 61980d1a8b [refactor] Break down the file into separate files, because it exceeded 1 kLOC 🙀 
[refactor] Consolidate `UITextView` and `UITextField` APIs.
[refactor] rename classes that start with `UI` to `CCUI`, since that prefix is reserved by Apple.
[bugfix] setting the placeholder for `CCUISingleLineTextField` was missing in `createSingleLineTextField`
[bugfix] In `MultiLineTextView`, if `placeholder` changed, there doesn't seem to be a deterministic way of updating the `placeholderLabel`. We are relying on `drawRect:`. Instead, `placeholder` is now a computed property on top of `placeholderLabel.text`.
[bugfix] If the user wants multi-line secure input, we should set it, since it is possible, right?
[minor] `[viewWithTag:999]` was used instead of calling the property itself.
[minor] `drawRect:` was used to load properties, when it is normally in the getter.
[minor] fix ObjC code style
 2015-09-15 23:36:26 +03:00
Neo Kim 11d80f47f8 Refactor list view's layout refreshing logic. 2015-09-15 22:34:00 +09:00
Neo Kim f58cbad6c2 Add 'jumpToItem()' to list view. 2015-09-15 22:33:50 +09:00
子龙山人 f2bee23696 Merge pull request #13789 from neokim/fix-13668 
Fix for #13668
 2015-09-15 18:28:24 +08:00
子龙山人 f5848290a2 Merge pull request #13673 from Almax27/patch-3 
Removed ScrollView::_innerContainer pointer copy
 2015-09-15 17:42:20 +08:00
andyque fe5a43c428 Enable tapping Slider bar to scroll 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13434
 2015-09-15 14:13:52 +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
子龙山人 1d7d283ee6 Merge pull request #13549 from neokim/add_getters_for_renderers_into_button 
Add getters for the internal renderer instances of Button
 2015-09-15 09:26:34 +08:00
Neo Kim c224a81497 Rectify typos 2015-09-14 15:27:51 +09: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 7f9c8acc2a ScrollView - Add a guard statement in setContentSize() to avoid resetting inner container's position if not necessary. 2015-09-13 21:43:34 +09:00
Neo Kim f39644d129 Remove default arguments in APIs and rename the parameter 'time' to 'timeInSec'. 2015-09-11 16:00:53 +09:00
Neo Kim 586af44fe6 ListView - Add getter / setter for magnetic out of boundary flag. 2015-09-09 10:29:19 +09:00
Neo Kim b28b8146e7 ListView - Add the logic for magnetic bounce back. 2015-09-09 10:29:19 +09:00
Neo Kim 3085e1385c ListView - Add 'startMagnetScroll()' for non-inertia scroll. 2015-09-09 10:29:18 +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
Neo Kim a4e5f7c0a8 ScrollView - Refactor the logic about getting out of boundary amount. 2015-09-09 10:28:47 +09:00
Neo Kim 90891f9efb ScrollView - Add a utility function 'flattenVectorByDirection()' 2015-09-09 10:28:46 +09:00
Neo Kim ea79d92aa1 ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back. 2015-09-09 10:28:46 +09:00
Neo Kim 7394b3f467 ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'. 2015-09-09 10:28:46 +09:00
Neo Kim c037769e62 ScrollView - Correct auto scroll direction 2015-09-09 10:28:45 +09:00
Neo Kim 2dec85e175 ScrollView - Fix that the last touch when release was not considered for inertia scroll 2015-09-09 10:28:45 +09:00
Neo Kim 5f469264fc ScrollView - Refactor auto scroll for simpler implementation 
- Remove auto scroll callback
 2015-09-09 10:28:45 +09:00
Neo Kim ad01bc7699 ScrollView - Add startAttenuatingAutoScroll() 2015-09-09 10:28:44 +09:00
Neo Kim 3cff03e8ed ScrollView - Remove movement callback from auto scroll. 2015-09-09 10:28:44 +09:00
Neo Kim 0c4414625a ScrollView - Rectify wrong indentations 2015-09-09 10:28:44 +09:00
子龙山人 75882e64a0 Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll 
Refactor scroll view's inertia scroll
 2015-09-07 22:38:20 +08:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8 
Sync v3.8 to v3
 2015-09-07 14:56:37 +08:00
Aaron 59fab25804 Removed innerContainer pointer copy when cloning 
Copied pointer becomes invalid when model widget destructs. Instead we simply copy the position.
 2015-09-03 11:29:58 +01:00
andyque c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +08:00
Neo Kim 3656ce99bd Fix an issue regarding non-bouncing scroll view 2015-09-01 15:13:18 +09:00
Neo Kim 129f4b3186 Implement the inertia scroll using auto scroll feature. Consolidate them into one. 2015-09-01 11:52:05 +09:00
Neo Kim ecd947d9f4 Change auto scroll feature to receive callbacks to remove dependencies. 2015-09-01 11:45:42 +09:00
Neo Kim 137a05a2aa Rectify the wrong indentations in switch statements 2015-09-01 11:45:42 +09:00
Neo Kim 69d23eb00c Extract the touch move speed calculation logic from inertia concept. 2015-09-01 11:45:42 +09:00
Neo Kim 81795f6d73 Add a guard statement in setInnerContainerPosition(). 2015-09-01 11:45:42 +09:00
Neo Kim 96a78f687c Remove redundant codes 2015-09-01 11:45:42 +09:00
子龙山人 2e9e660cbb Merge pull request #13220 from zilongshanren/testEditBoxWin32 
Improved EditBox implement for platform win32
 2015-09-01 10:40:11 +08:00
Jeff Wang b8105349c7 revert to the original state when user cancel input 2015-09-01 00:06:18 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
andyque 367a105a48 refactor EditBox iOS&Android implementation 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
 2015-08-31 18:36:27 +08:00
andyque 40492e6169 fix Slider create missing res type. 
fixed https://github.com/cocos2d/cocos2d-x/issues/13575
 2015-08-27 23:34:39 +08:00
pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/audio/winrt/Audio.cpp
	cocos/platform/winrt/CCCommon.cpp
	cocos/platform/winrt/CCWinRTUtils.cpp
	cocos/platform/winrt/CCWinRTUtils.h
 2015-08-27 10:40:04 +08:00
andyque 7f73415189 fix Scale9Sprite draw extra pixels in spritesheet 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13564
 2015-08-26 16:15:00 +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
子龙山人 734388d2bd Merge pull request #13556 from zilongshanren/fix-listview-intial-position 
fix ListView innerContainer initial position error
 2015-08-25 16:50:02 +08:00
andyque 65b78d4a49 fix ListView innerContainer initial position error 2015-08-25 15:15:18 +08:00
Neo Kim ab85406bc8 Added version comments 2015-08-25 11:21:26 +09:00
Neo Kim d2fb1bda7d Add getters for the internal renderer instances 2015-08-25 11:21:02 +09:00
子龙山人 b0561749bd Merge pull request #13537 from neokim/fix_issue_13516 
Fix issue 13516
 2015-08-25 10:01:03 +08:00
Neo Kim edd9fecf39 Update scroll bar when the inner container's size changes 2015-08-24 18:47:12 +09:00
Neo Kim 9f693ef8f3 Enhance readability 2015-08-24 18:46:43 +09:00
Neo Kim e1ed3ecb09 Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
Neo Kim 887efdca1b Add 'removeAllRadioButtons()' 2015-08-24 17:39:48 +09:00
Neo Kim 202b549073 Add getters for the internal renderer instances 2015-08-24 17:39:47 +09:00
Neo Kim da85b16292 Change not to dispatch event when add radio buttons 2015-08-24 17:39:46 +09:00
andyque 29f97d63ed fix scrollview innerContainer initial position. 2015-08-21 11:56:19 +08:00
Vladimir Perminov 24d06bb1c9 More use StringUtf8ToWideChar and PlatformStringFromString 2015-08-17 23:04:05 +03:00
andyque d45897ec53 fix RadioButton disallow selection issue. 2015-08-14 18:07:13 +08:00
andyque f9385d1604 fix iOS EditBox Chinese input maxLength issue. 
https://github.com/cocos2d/cocos2d-x/issues/12519
 2015-08-13 15:01:14 +08:00
andyque 68a90743c7 Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00
andyque 763976d50c fix ui::TextField status error. 
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.

2. Reorder the event handling in ui::TextField.
 2015-08-12 11:05:07 +08:00
pandamicro 6bcea5baee Fix issue described in #13284 by reorder state setting and event dispatching 
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
 2015-08-10 22:27:59 +08:00
pandamicro c54a204bad Synchronize enable state and bright state for Widget 
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
 2015-08-10 07:42:35 +08:00
pandamicro 1f52f0971a Fix CheckBox cross renderer state not updated correctly 
Issue description: When checkbox checked, its renderer adaptation may not be updated.

Reported http://punchbox.info:3000/issues/21630
 2015-08-09 20:57:37 +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
Jeff Wang bbf7e994e7 Improved EditBox implement for platform win32 2015-08-05 17:33:54 +08:00
andyque 2427c15b60 modify vertical scroll direction 2015-08-03 11:38:23 +08:00
andyque 63822566d2 refactor PageView implementation 2015-08-01 23:33:25 +08:00
andyque 5f34c1f072 add PageView vertical scroll support 2015-08-01 18:18:46 +08:00
pandamicro aa1a3bb6b7 Merge pull request #13137 from yangws/issue_9507 
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextFie…
 2015-07-31 15:43: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
pandamicro 6b9ca70e02 Merge pull request #13051 from yangws/issue_9400 
Fixed #9400 : Widget::setHighlighted does not work after setBright
 2015-07-31 09:50:20 +08:00
pandamicro 16eb88bf57 Merge pull request #13055 from yangws/issue_10082 
Fixed #10082 : Label and Text have different types for fontSize
 2015-07-31 09:49:48 +08:00
Vincent Yang e1d4d22353 Fixed #12692 : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
pandamicro cca95c3c51 Merge pull request #13041 from yangws/issue_10386 
Fixed #10386 : ui::TextField hitTest not working as expected.
 2015-07-29 09:52:06 +08:00
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
pandamicro 66b21fb2a8 Merge pull request #12972 from yangws/issue_12145 
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
 2015-07-28 17:13:26 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
pandamicro 0a31199a5b Fix widget onEnter override in JS may cause infinite recursion 2015-07-28 16:04:28 +08:00
Vincent Yang c6fc51a2d9 Fixed #10082 : Label and Text have different types for fontSize 2015-07-28 14:48:01 +08:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
Vincent Yang 14145e29a8 Fixed #9400 : Widget::setHighlighted does not work after setBright 2015-07-28 11:09:21 +08:00
fusijie 651d877e28 set minimum display length to 1. 2015-07-27 17:55:32 +08:00
Vincent Yang 19b3822d87 Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextField::setString 2015-07-27 17:25:48 +08:00
Vincent Yang 2f996b24ef Fixed #10386 : ui::TextField hitTest not working as expected. 2015-07-27 16:59:35 +08:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
Vincent Yang 57943b41b1 Fixed #12145 : formarRenderers in RichText doesn’t update container size. 2015-07-23 14:59:24 +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 cb5e2d59c3 Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range. 2015-07-20 17:50:02 +08:00
子龙山人 b6aa3960d2 Merge pull request #12848 from Mazyod/v3 
Improving iOS EditBox Implementation
 2015-07-18 23:21:27 +08:00
Mazyad Alabduljaleel fa284bc2db headers and whitespace 2015-07-17 18:05:42 +03:00
Mazyad Alabduljaleel 2bb26e31d0 simplify CGRect math 2015-07-17 17:38:16 +03:00
Mazyad Alabduljaleel 54f52dac80 reduce header exposure 
this is important, so we know that this class is only used in one place
 2015-07-17 17:37:15 +03:00
Mazyad Alabduljaleel 32c5be84b8 weird, how did this slip 2015-07-17 17:15:41 +03:00
Mazyad Alabduljaleel d8b7b1d565 Mac EditBox cleanup: 
+ Reduce header clutter
+ consistent property access and overall code style
+ cleanup extra code
 2015-07-17 17:12:09 +03:00
Mazyad Alabduljaleel 7861bfd403 Final touch ups: 
- group textfield delegate methods
- remove unused code
 2015-07-17 16:25:45 +03:00
andyque c9ca8d9ce8 fix PageView cur index issue 2015-07-17 10:39:01 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
pandamicro b094367c94 Merge pull request #12874 from pandamicro/v3.7-release 
Remove cleanup from auto bindings add made it support override in JS
 2015-07-16 16:15:26 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +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
Mazyad Alabduljaleel 008a5ef89c replaced tabs with whitespace 2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel 6f8bc04934 First commit for improving iOS EditBox 
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
 2015-07-14 16:18:03 +03:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
子龙山人 616efbf0c3 Merge pull request #12812 from neokim/refactor_scroll_view_bar 
Refactor scroll view bar
 2015-07-14 13:34:07 +08:00
Neo Kim 7882a534c1 Correct the wrong boolean statement and make it easy to read 2015-07-14 11:58:44 +09:00
Neo Kim 863c3a0a2a Correct a typo 2015-07-14 10:17:05 +09:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Neo Kim 9757ee4ea8 Refine scroll event dispatching. And add an event to track every move including jump and so on. 2015-07-13 21:28:17 +09:00
Neo Kim 22ea504af8 Add methods to manipulate scroll bar's opacity 2015-07-13 21:28:16 +09:00
Neo Kim f558158667 Use addProtectedChild() instead of addChild() in ScrollViewBar 2015-07-13 21:28:16 +09:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite. 
This story tells us that we should not just ignore warnings.
 2015-07-07 23:01:24 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view 
Add scroll bar feature into ScrollView
 2015-07-07 13:56:09 +08:00
Vincent Yang b4559a005b Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it. 2015-07-07 10:42:04 +08:00
XiaoFeng 214684b3be Fix 2015-07-06 16:45:04 +08:00
XiaoFeng 9fab1e7702 Change to use auto & for each to enum sub items 2015-07-06 16:39:00 +08:00
XiaoFeng d6fc8ecc94 Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly. 2015-07-06 16:02:19 +08:00
Neo Kim c4dc9b04fd Add a guard filtering tries to set same value. 2015-07-06 14:54:28 +09:00
Neo Kim 0ff7aaef95 Modify loop iteration codes 2015-07-06 11:30:24 +09:00
Neo Kim 43308e258a Fix an issue of not releasing Texture instance in ScrollViewBar 2015-07-06 11:29:39 +09:00
Neo Kim a4803c6713 Remove unnecessary commented out code. 2015-07-05 21:30:13 +09:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim 6264f7fefb Correct include-related build errors in some platforms 2015-07-04 15:03:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim f667b085b8 Change not to show scroll bar when the scroll view is initiated. 2015-07-04 09:59:22 +09:00
Neo Kim 9548d85f08 Fix radio button group clear issue 2015-07-04 09:57:54 +09:00
Neo Kim 3b6cd4dffc Modify indentation to comply with the convention 2015-07-04 09:56:53 +09:00
Neo Kim 86cbd59bfd Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim ec45be699d Add UIScrollViewBar class documentation 2015-07-04 09:56:52 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 9a11cfd496 Add a way of changing scroll bar width 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
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group 
Add RadioButton and RadioButtonGroup widgets
 2015-07-02 17:12:59 +08:00
XiaoFeng 668dc50e07 Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show 2015-07-02 16:45:17 +08:00
Neo Kim 61df7bc827 Add class documentation 2015-07-02 15:20:06 +09:00
Neo Kim ec589c8d6f Correct the wrong comment for lua 2015-07-02 15:19:50 +09:00
Neo Kim 0e35ee597a Add logic for not belonging radio button checking. 2015-07-02 15:01:24 +09:00
Neo Kim c4aa5a6274 Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore. 2015-07-02 11:50:50 +09:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
XiaoFeng 9a905ede56 Fix check box front cross texture expand to normal size when change status between normal and disable frequency 2015-07-02 10:29:53 +08: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
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
Neo Kim a64e50688e Add the new files into CMake and Windows project configurations. 2015-07-01 12:21:42 +09:00
Vincent Yang 96b49277cc [ci skip] add comment for UIWidget::_hittedByCamera. 2015-07-01 11:03:09 +08: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 f5e7184f0b Add new cpp files into Android.mk 2015-06-30 18:50:13 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
Neo Kim a37015d083 To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class. 2015-06-30 18:50:13 +09:00
Vincent Yang 2ba6f266ad Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-30 14:32:14 +08:00
子龙山人 950cb840c2 Merge pull request #12582 from super626/listview 
fix camera mask of listview
 2015-06-30 10:25:57 +08: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
yangxiao a56a5d24b6 fix camera mask of listview 2015-06-29 14:41:03 +08:00
andyque 60834e6f0c Merge branch 'v3' into v3-finish-android-9-patch-image-format 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-29 12:05:52 +08:00
andyque 30d2129f0c improve indent and getTime function 2015-06-29 11:52:53 +08:00
pandamicro 4b34963329 Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi 
use inch for childFocusCancelOffset in UIScrollView
 2015-06-26 08:11:00 +08:00
pandamicro 3136bef9e3 Fix convertDistanceFromPointToInch logic (add x, y) 2015-06-25 21:34:00 +08:00
pandamicro e29284374b Fix convertDistanceFromPointToInch logic 2015-06-25 20:57:23 +08:00
samuele3hu 3a654b4615 Fix the compile error of js-template by using android-studio compile param. 2015-06-25 17:44:51 +08:00
andyque d83f528327 use inch for childFocusCancelOffset in UIScrollView 2015-06-25 16:57:00 +08:00
andyque 7fff2bd3c4 fix nine patch image parser error on Windows. 2015-06-23 15:42:58 +08:00
Neo Kim 9757be0f81 Remove debugging logs 2015-06-22 14:49:30 +09:00
Neo Kim 71c98da2aa Apply ease out action on inertia scroll 2015-06-22 14:30:45 +09:00
Neo Kim c4fa99444c Simplify the inertia scroll implementation 2015-06-22 14:30:36 +09:00
Neo Kim c70c923674 Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature. 2015-06-22 14:30:30 +09:00
Neo Kim 7422b20da9 Refactor some functions 2015-06-22 14:27:19 +09:00
Neo Kim 85fc5b3f89 Change to comply to Cocos2d-x convention 2015-06-22 14:27:11 +09:00
Neo Kim 6c212a7ddb Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back. 
It does what the existing code did including scroll event dispatching and attenuating.
 2015-06-22 14:27:00 +09:00
Neo Kim 1058ab9172 Add necessary member variables and methods 2015-06-22 14:26:51 +09:00
Neo Kim a8f77710f5 Refactor some functions and remove redundant codes 2015-06-22 14:10:25 +09:00
Neo Kim 876c94f352 Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back. 2015-06-22 14:05:53 +09:00
Neo Kim ff3f990142 Add isOutOfBoundary() functions 2015-06-22 14:05:53 +09:00
Neo Kim c3c6eeb6c1 Refactor some functions 2015-06-22 14:05:52 +09:00
Neo Kim a3ff9573b0 Remove duplicated logic in bounceScrollChildren() 2015-06-22 14:05:51 +09:00
Neo Kim 1971b01280 Make the event dispatch functions into one function after removing duplicated logic. 2015-06-22 14:05:50 +09:00
Neo Kim 31bf9f714d Merge bouncing and non-bouncing logics as one. 2015-06-22 14:05:50 +09:00