zilongshanren
|
13ab2a1242
|
fix scrollview layout as content issue
|
2016-05-18 18:00:41 +08:00 |
|
Jare Guo
|
142aeed175
|
add preload lifecycle method
|
2016-05-16 15:41:49 +08:00 |
|
Jare Guo
|
f8edcbe802
|
remove cc.sys.isNative in html5
|
2016-05-13 11:21:22 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +08:00 |
|
zilongshanren
|
951169ca66
|
fix scrollView boundary calculation
|
2016-05-09 10:06:49 +08:00 |
|
Jare Guo
|
1bfe4f3fd1
|
Merge pull request #591 from cocos-creator/v1.0
sync V1.0
|
2016-04-12 14:39:26 +08:00 |
|
Nan Wang
|
c3961feb8a
|
update i18n differed component help link
|
2016-04-11 19:06:30 +08:00 |
|
zilongshanren
|
719bcf9766
|
fix scrollview content boundary
|
2016-03-30 14:35:06 +08:00 |
|
knoxHuang
|
7bbb724c1f
|
update CCScrollView and CCScrollBar API
|
2016-03-17 15:02:45 +08:00 |
|
zilongshanren
|
ece6f7e6c5
|
fix magic number
|
2016-03-14 14:46:11 +08:00 |
|
zilongshanren
|
59146fd047
|
fix mousewheel scrollbar fade
|
2016-03-14 11:34:47 +08:00 |
|
zilongshanren
|
4009c9a7a9
|
fix scrollview mouse wheel event
|
2016-03-14 10:43:13 +08:00 |
|
zilongshanren
|
e6313807ae
|
add mousewheel event to scrollview
|
2016-03-12 16:51:20 +08:00 |
|
knoxHuang
|
2d7f991a11
|
update components api url
|
2016-03-09 18:33:13 +08:00 |
|
knoxHuang
|
57a8e12052
|
built-in module in the title next to add a help icon.
|
2016-03-09 17:57:13 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
zilongshanren
|
3ca164fe19
|
fix reset scrollbar null exception
|
2016-02-17 11:33:15 +08:00 |
|
minggo
|
2032155237
|
fix comments error
|
2016-02-01 18:48:46 +08:00 |
|
minggo
|
ca8a6ca3f8
|
fix some comments
|
2016-02-01 14:27:13 +08:00 |
|
2youyouo2
|
628aeb7737
|
add animatable: false for component
|
2016-01-25 12:08:10 +08:00 |
|
Wang Nan
|
c25078ef42
|
Merge pull request #227 from fireball-x/v0.7
merge v0.7
|
2016-01-11 21:48:34 +08:00 |
|
zilongshanren
|
47b39fa2cb
|
fixup! fix scrollview brake with large content size.
|
2016-01-11 17:23:37 +08:00 |
|
zilongshanren
|
ec7111c900
|
fix scrollview brake with large content size.
fixed: https://github.com/fireball-x/fireball/issues/1487
|
2016-01-11 17:06:39 +08:00 |
|
pandamicro
|
8a8d139e1c
|
Roll back some mistaken changes to Button/ScrollView, my bad
|
2016-01-11 10:17:13 +08:00 |
|
pandamicro
|
e0e741884d
|
Fix event handling issues in Button/ScrollView
|
2016-01-10 03:29:06 +08:00 |
|
zilongshanren
|
643247a53f
|
fix auto scroll time issue
|
2015-12-29 16:49:53 +08:00 |
|
zilongshanren
|
3ce238070d
|
don't do hitTest in touch move and touch ended
|
2015-12-29 15:11:29 +08:00 |
|
zilongshanren
|
2a471bae7b
|
Improve button and scroll touch dispatch
Squashed commit of the following:
commit 8fcc4f4d116372072959d4c8a6192247d953d0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 21:51:25 2015 +0800
refactor button and scrollview to use new event.
commit f3c1bc2153c85ee913a3a674c8f418087384146d
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 17:04:06 2015 +0800
fix touch move out and in, button state is wrong.
commit 57ad4c7d887b879a1f71281798347057652decff
Merge: 7b3fe78 7c6f572
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 15:39:03 2015 +0800
Merge remote-tracking branch 'fireball/v0.7' into fixButtonClickEvent
commit 7b3fe785dee943abfcfdc04ad5c228b4247bbd2f
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 15:38:24 2015 +0800
remove self emit touch event
commit c1afba5131e3f3735ca236fdb693a72cff52ba4b
Merge: 6939b66 45e877a
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 11:44:59 2015 +0800
Merge remote-tracking branch 'fireball/v0.7' into fixButtonClickEvent
commit 6939b66f6c2bbe4de1adc26b81613ddd40828b6e
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 11:44:28 2015 +0800
fix typo
|
2015-12-28 21:53:27 +08:00 |
|
zilongshanren
|
8fbc0e94c4
|
add defensive technical to scrollview
|
2015-12-24 14:21:16 +08:00 |
|
zilongshanren
|
16f30cc3e6
|
done
|
2015-12-22 17:20:52 +08:00 |
|
zilongshanren
|
be088f9f05
|
add comments to scrollview public APIs.
|
2015-12-22 17:07:06 +08:00 |
|
zilongshanren
|
d8b89b99d5
|
refine the delta move logic
|
2015-12-22 15:06:58 +08:00 |
|
zilongshanren
|
0d15a65b2f
|
don't show scrollbar at start time.
|
2015-12-22 11:39:15 +08:00 |
|
zilongshanren
|
72c871dd09
|
clamp percent value to 1-100
|
2015-12-22 11:00:26 +08:00 |
|
zilongshanren
|
608cb572f1
|
add scrollto interface
fixed issue https://github.com/fireball-x/fireball/issues/1002
add jumpToXXX interfaces
add scroll to percent api.
|
2015-12-22 10:53:27 +08:00 |
|
zilongshanren
|
e9287d3037
|
Improve Scrollview and refine the properties
Squashed commit of the following:
commit d10bd73f87fae6ba39858e190921155475ede586
Merge: b174d7c 2ed54b8
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 21 17:44:25 2015 +0800
Merge remote-tracking branch 'fireball/master' into fixScrollView
commit b174d7cd36fffccf78659b4018940d03da5a6587
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 21 17:20:53 2015 +0800
fix content size smaller than scrollvie size
commit 8a3ff65f1d2f0e1a6a569a037b7fad1ec9e235e8
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 21 16:24:45 2015 +0800
add new brake logic
commit 84da9372a148caa7fd6518f3d12f5fe191454729
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 21 15:05:08 2015 +0800
renaming the properties
commit f3c40a8e7ad6e6097bf07399201ac82e8d5fa72b
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 21 14:21:38 2015 +0800
fix scrollbar positioning
commit d3eb25ddd34a6634737804f55b65e355c003938b
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 21 13:54:05 2015 +0800
fix scrollview doesn't respect to content anchor.
|
2015-12-21 17:47:55 +08:00 |
|
Nan Wang
|
682363d12d
|
update i18n component tooltip.
|
2015-12-21 11:49:40 +08:00 |
|
Nan Wang
|
bb5a297413
|
update scrollview menu path.
|
2015-12-20 23:22:13 +08:00 |
|
zilongshanren
|
7bf2a8b28d
|
rename a _isCurrAndPrevTouchPositionHitTest method
|
2015-12-18 18:22:00 +08:00 |
|
zilongshanren
|
e571a476a8
|
refactor scrollview naming
|
2015-12-18 18:07:16 +08:00 |
|
zilongshanren
|
4fca96de4c
|
fix doc format
|
2015-12-18 17:29:07 +08:00 |
|
zilongshanren
|
9046f6d0c9
|
rename a function
|
2015-12-18 17:21:36 +08:00 |
|
zilongshanren
|
1f082f2005
|
add missing docs
|
2015-12-18 17:15:30 +08:00 |
|
zilongshanren
|
ee024d428e
|
Add ScrollView and ScrollBar
Squashed commit of the following:
commit 34fea7fd4ea962f041ebadf4a5b17b3710a1fa02
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 18 14:47:00 2015 +0800
finish scrollview feature
commit 373eff672e4f81b79951cd583fc63865c76a0093
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 18 14:34:49 2015 +0800
fix float point compare issue
commit 4701cea8b488ae169407fca5be203d9a5e5fcccc
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 18 10:56:09 2015 +0800
fix component naming
commit 20f86a505aa09630b0bdf2ad6bdf4287777951aa
Merge: 279d2fc 3c6522e
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 18 10:55:23 2015 +0800
Merge branch 'master' into addScrollView
commit 279d2fc1143f6ec473e2ccfcaecc86a50087e033
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 18 10:40:32 2015 +0800
make elastic work
commit ed5c3cdb600bdc3d998280ab7e50d2703b50ed71
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 18 10:11:00 2015 +0800
fix bouncing issue
commit 8a1d3be8aff624597592954a58ce3b48c289c9f9
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 15:26:57 2015 +0800
make brake factor working
commit 7e3099de4aad72fbf60d3930e9e4337b1c5af828
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 14:56:21 2015 +0800
make scrollview inertia scroll working
commit 3c3b29935e1dcdcd9eb2f96637ce168ec35a4ac1
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 14:31:51 2015 +0800
fix convertToWorldSpace
commit 9d58b715f56f010a84e6903962169eea6d450d00
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 11:18:51 2015 +0800
add inertia scroll skeleton
commit 1523775943394139e723f9f7fdca4ad89a49cc70
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 10:48:14 2015 +0800
add a few scrollview variables
commit c5231fa52e580d80bd47de60133242cd5c9f0901
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 10:08:23 2015 +0800
finish scrollbar auto hide
commit 8c79eb33c0a2e25c108c3e03c90c1343469659ea
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 09:44:03 2015 +0800
fix toggle scrollbar
commit b6a24f82ee1ec4e391adf0e5ecc8c3d0477682d6
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Dec 17 09:34:46 2015 +0800
finish scroll bar position
commit ba1dab366e94020bddcb0f3b4243c574ff60afa7
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Dec 16 20:22:23 2015 +0800
fix convert to node space issue
commit e596d37aedb963bfd0f21f383d12f7c828c6c2bf
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Dec 16 17:54:26 2015 +0800
fuck
commit 3b238be9d0e72a6414e3c578190ed6722dee9899
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Dec 16 16:42:05 2015 +0800
make handle's position correct
commit e7c21508d1a08c0df761cf945e8d9714391e6f6b
Merge: a882517 3f58254
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Dec 16 10:52:02 2015 +0800
Merge remote-tracking branch 'origin/master' into addScrollView
commit a882517765f5fae042cfde472202c22e0cc09416
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Dec 16 10:51:33 2015 +0800
update scrollview
commit 90af1f848509325d317f0df0edb203697a9c04e5
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Dec 15 21:17:27 2015 +0800
make horizontal and vertical move work
commit b5274cb9248e6eebf29e0ba8ceb3e96cb2d7f483
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Dec 15 20:57:00 2015 +0800
update scrollbar
commit 43ae08aed730588303fe41857def7d51aea890e6
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Dec 15 16:26:50 2015 +0800
add scrollbar skeleton
commit 6a4c1a39eeabad06f871a32f77d442f4fcd9b487
Merge: 1184415 306f66a
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 14 20:42:05 2015 +0800
Merge branch 'master' into addScrollView
commit 1184415480d1b08c589365c6ba919b438a760aa5
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 14 20:01:18 2015 +0800
add touch event handler
commit 510eba29001073b8c1215d50ae12f3e6d2bc37d6
Merge: d0e44ad e89a6f7
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 14 17:55:27 2015 +0800
Merge branch 'master' into addScrollView
commit d0e44ad90740706fa34480a3c8228fd1250c0c74
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 11 18:22:23 2015 +0800
add scrollbar components
commit 8a812def219517d6daab857e997084f7e0bea878
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Dec 11 17:48:42 2015 +0800
add scrollview skeleton
|
2015-12-18 14:49:12 +08:00 |
|