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

18 Commits

Author SHA1 Message Date
minggo 0d121d7913
remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
Jeff Wang 3948e5eece refine EditBox: add support for pressed and disabled image (#18965) 
* refine EditBox add support for pressed and disabled image

* add test case

* fix compile error

* fix compatibility

* fix compile warning

* fix test cases

* remove CC_DEPRECATED_ATTRIBUTE mark
 2018-08-07 09:29:51 +08:00
leeda 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
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
子龙山人 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
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
mogemimi f395cadbac Add CC_GUI_DLL to suppress warning C4275 2016-04-27 04:08:09 +09: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 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
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +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 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