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

25 Commits

Author SHA1 Message Date
Vladyslav Kaplun 4f386a4d26 18572 PR amends & override warning fix (#18580) 2018-01-09 09:26:15 +08:00
Vladyslav Kaplun 4c0361e184 Fix cocos2d::EditBox padding (#18572) 2017-12-18 11:23:36 +08:00
James Chen b633260020 Should use setTextColor for editbox placeholder. (#18311) 2017-09-22 16:06:13 +08:00
minggo 61839e7a5b fix warnings (#17970) 2017-06-23 17:46:37 +08:00
子龙山人 48f6d1c0e5 Refactoring editbox and system label on win32 platform (#17828) 
* refactoring windows editbox

* refactoring win32 system label

* fix jenkins ci issue

* remove unneeded function call
 2017-05-17 16:20:21 +08:00
子龙山人 55b14cbde5 Fix android edit box duplicated text (#17775) 
* fix editbox textChanged event called after fragment loaded

* fix editbox duplicatd text when change text in textChanged callback

* revert changes of placeholder modification
 2017-05-04 15:04:47 +08:00
Jeff Wang 26fe3def2f Refine editbox for issue 17346 --merge some member variables into EditBoxCommon (#17361) 
* add some getters for EditBox and EditBoxImpl

* remove duplicate member variables from EditBox

* fix todo

* change to pure virtual methods for class EditBoxImpl
 2017-02-17 15:45:19 +08:00
子龙山人 1b0a6c2c5c Sync editbox improvement from cocos creator (#16965) 
* sync the changes from creator

* fix editbox vertical alignment

* improve android editbox multiline text vertical alignment
 2016-12-07 09:21:17 +08:00
pyrosphere 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
Josh Bodily c3c6681b9e Add Horizontal Text Alignment to UIEditBox (#16772) 
* Add Horizontal Text Alignment to UIEditBox

* Fix compile error

* Fix win32 compile
 2016-11-09 10:38:00 +08:00
Josh Bodily 9f31a1e43c Add reason for edit end to UIEditBoxDelegate (#16771) 
* Add reason for edit end to UIEditBoxDelegate

* Adds "NEXT" action button for iOS and Android for easier form
* navigation

* Fix compile error
 2016-11-03 14:02:53 +08:00
zilongshanren 459b7f30c6 refactoring Android editbox setVisible API 
fix set visible issue of android editbox

fix android lower case multiline

revert unkown changes
 2016-06-23 18:18:39 +08:00
Xpol Wan 1cc0130bdd Fixes signed/unsigned mismatch warnings. 
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
 2016-04-26 17:53:25 +08:00
Josh Bodily 614c3c47d7 Josh/winrt inplace editbox (#15473) 
* WinRT in-place edit box

* Fix static analysis errors
 2016-04-25 11:17:09 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
zilongshanren 4db0d2c47a Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport 
add Mac Editbox multiline  support.
 2016-02-11 21:33:56 +08:00
zilongshanren a93bc88d31 add Mac Editbox multiline support. 
1. It also refactor the original logic and optimize the iOS EditBox implementation.
 2016-02-04 14:21:07 +08:00
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +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
zilongshanren 02b59f020e Fix onEndEditing issue in script. 
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
 2015-11-18 15:05:13 +08:00
mogemimi daa29752db Fix typo in UIEditBox 2015-10-12 13:57:50 +09: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 c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +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