e27f33a74b
Issue18909 Widget::getAncestorWidget fix ( #18913 )
2018-07-10 23:02:37 +08:00
18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
afcffc7b3a
Handle auto layout with scaled widget ( #17822 )
...
* handle auto layout with scaled widget
* add test for UILayout for Scaled Widget
* add test for UILayout - Scaled Widget - JS
2017-05-26 10:09:57 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
b672b94edc
Removed unnecessary assignments ( #17328 )
2017-02-09 10:57:01 +08:00
86ef735e60
Fix misspelling of setFirstFocusedWidget function ( #17219 )
2017-01-19 09:41:12 +08:00
59403ad40d
Propagate onTouchCancelled ( #17174 )
2017-01-13 18:09:01 +08:00
71a82f0f0d
Correct spelling of function name `getAncestorWidget` ( #17158 )
2017-01-11 05:36:13 -08:00
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
c0e1e91373
Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. ( #16716 )
...
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.
Other minor trivial changes were applied.
* Fixed Android compilation error
* Fixed windows-universal compilation error
2016-10-27 15:10:24 +08:00
c3bbbb6cb2
Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format ( #16615 )
...
* refactoring ui related code
* fix label bmfont/charmap etc drawing
* make code more robust
2016-09-30 09:42:21 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
dafa8054bf
fix: missing properties for clone
...
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
2016-06-15 14:39:18 +08:00
0cac519e5c
fix uiWidget clipping error with Node
2015-12-23 16:05:52 +08:00
b0d88a552a
Merge pull request #14419 from xiaofeng11/v3_combine_ui
...
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
0b3a342222
Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets
...
Set focus for widgets
2015-11-17 11:24:27 +08:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
2785a4313f
Set focus for widgets
2015-09-30 12:31:33 +03:00
4b83240bed
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 11:20:36 +08:00
2fea4db9fc
fix ui::Button title location issue
2015-09-15 13:37:32 +08:00
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
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
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
9fea134de1
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
2015-07-28 18:24:03 +08:00
0a31199a5b
Fix widget onEnter override in JS may cause infinite recursion
2015-07-28 16:04:28 +08:00
14145e29a8
Fixed #9400 : Widget::setHighlighted does not work after setBright
2015-07-28 11:09:21 +08:00
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
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
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
e02dad3489
fix ui grayscale shader memory release issue
2015-04-20 17:00:40 +08:00
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
a42d213d16
update for ui object scale9 state refresh
2015-01-20 17:24:04 +08:00
62020483fc
the ui widget need to refresh size by ignore state
2015-01-19 17:09:15 +08:00
3f99f3d454
fix crash when navigation controller is null
2015-01-15 15:18:14 +08:00
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
dcd544cc66
update ui widget function format
2014-12-24 11:12:14 +08:00
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
f5a242be97
update for widget percent position and size logic
2014-12-22 15:23:26 +08:00
5a73ea9313
reset widget chaned
2014-12-22 15:04:25 +08:00
56e42b0a0a
update for lay out
2014-12-22 11:20:03 +08:00
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
9c3c693a21
refactor Widget flip logic
2014-11-07 11:11:51 +08:00
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
bca15538e3
Merge pull request #8823 from super626/v3
...
add isVisibleByVisitingCamera check
2014-10-18 15:11:45 +08:00
3f954857a8
update for lay out
2014-10-17 19:13:37 +08:00
Koveshnikov Peter