Commit Graph

20 Commits

Author SHA1 Message Date
zilongshanren 6522aad698 fix editbox touch issue.
fix loadRes API issue
2016-03-26 10:40:15 +08:00
zilongshanren cc8957cfca fix editbox text vertical alignment 2016-03-24 21:27:26 +08:00
zilongshanren 369377f331 redraw will cause the syncStatus result wrong... 2016-03-22 18:00:20 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00
zilongshanren 201bf96706 fix jsb overflow none 2016-03-10 10:11:59 +08:00
zilongshanren ebb8880ca2 fix editbox content style 2016-03-02 17:53:35 +08:00
zilongshanren d5817c9fb7 fix editbox placeholder positioning issue 2016-03-02 16:29:10 +08:00
zilongshanren 23e977e453 add editbox background scale9 capInsets support 2016-03-02 14:07:23 +08:00
zilongshanren 07c0e685b9 use clamp instead of none overflow 2016-03-02 10:24:28 +08:00
zilongshanren 2195f92908 optimize EditBox enum naming 2016-03-01 17:57:35 +08:00
zilongshanren f3ff3aaa2e refactor function names 2016-02-28 12:02:16 +08:00
zilongshanren 9309112ac0 improve editbox 2016-02-27 15:01:02 +08:00
zilongshanren f9c747d0a9 cleanup code 2016-02-26 18:13:29 +08:00
zilongshanren 5bf14a8f4c Improve EditBox
change SpriteFrame to Sprite

rename placeHolder to placeholder

fix placeholder

Revert "change SpriteFrame to Sprite"

This reverts commit d968d8ac9a01d91b3055830aab109b934ae27138.

fix clear spriteframe

fix init size and label font size

add line height support
2016-02-26 16:28:18 +08:00
zilongshanren d6a977fd38 fix jsb editbox issue 2016-02-24 21:26:05 +08:00
zilongshanren 0a6293bad0 Improve EditBox
Squashed commit of the following:

commit ad31d2beadceea31732970145238a68a97995b76
Merge: 8e15189 061e6ca
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 16:51:09 2016 +0800

    Merge remote-tracking branch 'me/master'

commit 8e15189d4a37d7215ffb66d6c08ec0b79cc57a19
Merge: 7c233f0 968480e
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 16:50:19 2016 +0800

    Merge remote-tracking branch 'fireball/master'

commit 7c233f03db2a78b1ab2c5866520efef04a6c4920
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 16:47:25 2016 +0800

    minor fix

commit fc89b4f920f979497e5961e48c1c796e18c3aa8e
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 14:24:43 2016 +0800

    add editbox reorder functionality

commit 6fd1b48199ce351716c43250497e5b192194b1d5
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 18:21:48 2016 +0800

    fix label rendering issue on editor

commit 2a335cd701ed62c6bc45f8849b4322413cf9acca
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 16:10:43 2016 +0800

    add label

commit 51180fae14b43bfe2a2e11d618dda7a91b7522f1
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 14:02:47 2016 +0800

    refactoring, add EditBoxImpl

commit d40cf8839963a98446a3b85f033f352b3325f7ed
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 11:30:35 2016 +0800

    add toggle native editbox logic

commit 6114905f7222e8a21a8bc32be71f0bef1c4c658e
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Feb 19 13:37:34 2016 +0800

    remove resize and add vertical scrollbar

commit 061e6cadf259a2c6ae3b178fb45a747427af8589
Merge: c2a142c 0314e4c
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 14:25:41 2016 +0800

    Merge remote-tracking branch 'fireball/master'

commit c2a142ce003f2d85d5f161be69f79dd6c0eaa68d
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 14:24:43 2016 +0800

    add editbox reorder functionality

commit 48f02e97f27847b431c510d60fdf9380b14b650f
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 18:21:48 2016 +0800

    fix label rendering issue on editor

commit 3b40ce5bd6a9ef8aa6c4f4b7874408e446ecc655
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 16:10:43 2016 +0800

    add label

commit c304e8f40f9097905023d5bb5206faa6cf20be1a
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 14:02:47 2016 +0800

    refactoring, add EditBoxImpl

commit 913b52536e9085ec2baaf3c71cd8300d7a988962
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 11:30:35 2016 +0800

    add toggle native editbox logic

commit 2058f73ab82c1aa28c2ccf36046a727477a4c519
Merge: 744d8ad 595d744
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 10:48:43 2016 +0800

    Merge remote-tracking branch 'fireball/master'

commit 744d8ad93d6b8bc322173c828be954b9f2834bbb
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Feb 19 13:37:34 2016 +0800

    remove resize and add vertical scrollbar
2016-02-23 16:52:22 +08:00
minggo abf53d15a6 fix some comments 2016-02-02 15:46:20 +08:00
zilongshanren a67c846bf7 refine EditBox 2016-01-26 15:00:06 +08:00
zilongshanren f98aa9bc31 fix ci errors and refactor cceditbox 2016-01-25 10:29:54 +08:00
zilongshanren 7c66c1e4b6 add EditBox component.
rename editbox to sgEditBox

add editbox components

add background scale9sprite to editbox

add function to change editbox bgsprite size

add editbox properties

add string property

sync all the interfaces

refactor button event handler

finish single line editobox

finish multiline editbox

add editbox component
2016-01-22 18:08:04 +08:00