Commit Graph

147 Commits

Author SHA1 Message Date
minggo 8e2ad2fd12
Editbox init member variable (#18432)
* initialize _adjustHeight

* remove unneeded void
2017-11-02 13:57:11 +08:00
Felippe Durán d651298d3e Fix bug of returning UNKNOWN event for return type key SEARCH/SEND in EditBox for Android and SEARCH for iOS. (#18192) 2017-11-01 17:33:31 +08:00
James Chen b633260020 Should use setTextColor for editbox placeholder. (#18311) 2017-09-22 16:06:13 +08:00
mogemimi a5374d0411 Fix minor typos (#18289) 2017-09-20 09:05:00 +08:00
minggo 5a3244511a use correct selector to fix crash (#18132) 2017-08-07 17:00:35 +08:00
minggo 61839e7a5b fix warnings (#17970) 2017-06-23 17:46:37 +08:00
saumyamukul 0a69031db3 [Windows]Fix edit box spacing and alignment (#17807)
* Fix windows edit box crash, spacing, and alignment

Signed-off-by: saumya.mukul <saumya.mukul@mx.com>

* Cleanup

* Reset file attributes
2017-05-31 08:57:11 +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
James Chen 90403fc632 Fixes memory issues catched by Xcode Analyze Tool. (#17489) 2017-03-14 11:09:31 +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
子龙山人 a8f7668b8c Fix glfw mac os 10.12.2 (#17351)
* remove hack code for glfw on 10.12.2

* bump external version to 125
2017-02-14 16:03:44 +08:00
j-jorge c616d6d9ff Compilation fix (#17209)
* Fix various compilation issues.

Mostly errors on field initialization order but also missing files
in CMakeLists and missing include directives.

* Fix compilations issues with GCC 6.2

* Fix gitignore libs/ entry to not ignore the Android external libraries.
2017-02-04 09:46:32 +08:00
DavidDeSimone 54c32fc669 Fix for issue #17114. Improves the ability to add placeholder color and font for single line text fields on iOS 2017-01-08 16:02:17 -08:00
子龙山人 3302781dae fix tizen compile issue (#17002)
* fix tizen compile issue

* fix linux compile issue
2016-12-14 11:55:38 +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
子龙山人 ee8305ed52 fix editbox can't input on macos 10.12 (#16842)
* fix editbox can't input on macos 10.12

fix editbox can't input characters on mac os 10.12

* update external to 114
2016-11-16 09:38:42 +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
David DeSimone fb9c1f2de0 Fixed EditBox placeholder font not being set correctly for multiline text fields on iOS. (#16821) 2016-11-09 10:27:34 +08:00
Josh Bodily e20c1e0a9a Misc. UIEditBoxImpl-winrt fixes (#16773)
* SENSITIVE doesn't imply password, fixes crash on static cast in
* onTextChanged
* Fix type fontName instead of pFontName
* Set attributes that affect text content before setting initial text
2016-11-04 09:38:48 +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
Josh Bodily 40b5c9f4b7 Mac edit box bug fixes (#16656)
* Don't allow multiline to overflow bounds of box
* Fix bug w/ performSelector
2016-10-31 15:16:18 +08:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
mogemimi 98cc48bc62 Add missing override keyword 2016-07-13 15:03:53 +09:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +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
zilongshanren a6b0ea76de improve editbox test and font creation 2016-06-23 15:57:41 +08:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
子龙山人 bac1870d16 fix android editbox custom font file (#15924)
* fix android editbox custom font file

* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835)
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
minggo 7e1da2188c ios supports LOWERCASE_ALL_CHARACTERS 2016-06-07 10:31:16 +08:00
minggo 7e2f79ce8f not use capital letters by default 2016-06-06 13:55:20 +08:00
mogemimi 320ec027f7 Replace CCAssert macros with CCASSERT 2016-05-18 01:49:35 +09:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
mogemimi 8429b34010 Reduce unnecessary c_str() calls 2016-05-04 04:18:25 +09:00
zilongshanren 482788c933 Add tizen support (#15518)
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
minggo 2a4799758d Merge pull request #15511 from xpol/signed-unsigned-mismatch
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
mogemimi f395cadbac Add CC_GUI_DLL to suppress warning C4275 2016-04-27 04:08:09 +09: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
zilongshanren 6e3d69dded Merge pull request #15336 from cocos2d/v3.10
V3.10
2016-03-29 11:23:11 +08:00
zilongshanren ff6b7080f5 fix systemFontDirty and lineBreakMode issue 2016-03-22 14:47:33 +08:00
zilongshanren 400e77808c Revert "UIEditBox attachWithIME, detachWithIME make working" 2016-03-22 14:18:39 +08:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +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
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working
(android, iOS tested)
2016-03-17 10:26:53 +09:00