Neo Kim
|
ceeca575f3
|
Replace 'margin' of scroll bar with 'positionFromCorner'
|
2015-07-04 14:05:47 +09:00 |
Neo Kim
|
f667b085b8
|
Change not to show scroll bar when the scroll view is initiated.
|
2015-07-04 09:59:22 +09:00 |
Neo Kim
|
3b6cd4dffc
|
Modify indentation to comply with the convention
|
2015-07-04 09:56:53 +09:00 |
Neo Kim
|
86cbd59bfd
|
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
|
2015-07-04 09:56:53 +09:00 |
Neo Kim
|
60c32f6fb5
|
Refactor some codes
|
2015-07-04 09:56:53 +09:00 |
Neo Kim
|
ec45be699d
|
Add UIScrollViewBar class documentation
|
2015-07-04 09:56:52 +09:00 |
Neo Kim
|
c093bb18e2
|
Add scroll bar manipulation methods into ScrollView
|
2015-07-04 09:56:52 +09:00 |
Neo Kim
|
9a11cfd496
|
Add a way of changing scroll bar width
|
2015-07-04 09:56:52 +09:00 |
Neo Kim
|
2cae17b462
|
Add scroll bar feature into ScrollView
|
2015-07-04 09:56:52 +09:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
子龙山人
|
5b971ee93d
|
Merge pull request #12607 from neokim/add_radio_button_and_group
Add RadioButton and RadioButtonGroup widgets
|
2015-07-02 17:12:59 +08:00 |
XiaoFeng
|
668dc50e07
|
Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show
|
2015-07-02 16:45:17 +08:00 |
Neo Kim
|
61df7bc827
|
Add class documentation
|
2015-07-02 15:20:06 +09:00 |
Neo Kim
|
ec589c8d6f
|
Correct the wrong comment for lua
|
2015-07-02 15:19:50 +09:00 |
Neo Kim
|
0e35ee597a
|
Add logic for not belonging radio button checking.
|
2015-07-02 15:01:24 +09:00 |
Neo Kim
|
c4aa5a6274
|
Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore.
|
2015-07-02 11:50:50 +09:00 |
Neo Kim
|
6550a9ccc2
|
Replace all tabs to 4 spaces to comply with the convention
|
2015-07-02 11:30:14 +09:00 |
XiaoFeng
|
9a905ede56
|
Fix check box front cross texture expand to normal size when change status between normal and disable frequency
|
2015-07-02 10:29:53 +08:00 |
Neo Kim
|
4b2bff4674
|
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
|
2015-07-02 11:28:14 +09:00 |
Vincent Yang
|
d26c08de46
|
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
|
2015-07-01 14:47:42 +08:00 |
yangxiao
|
269feeb1f9
|
remove stencil from Renderstate
|
2015-07-01 14:06:37 +08:00 |
Neo Kim
|
a64e50688e
|
Add the new files into CMake and Windows project configurations.
|
2015-07-01 12:21:42 +09:00 |
Vincent Yang
|
96b49277cc
|
[ci skip] add comment for UIWidget::_hittedByCamera.
|
2015-07-01 11:03:09 +08:00 |
Neo Kim
|
3f05ad2b98
|
Replace all tabs to 4 spaces to comply with the convention
|
2015-06-30 20:31:31 +09:00 |
Neo Kim
|
f5e7184f0b
|
Add new cpp files into Android.mk
|
2015-06-30 18:50:13 +09:00 |
Neo Kim
|
bed90606d3
|
Add RadioButton feature and a test case for it.
|
2015-06-30 18:50:13 +09:00 |
Neo Kim
|
a37015d083
|
To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class.
|
2015-06-30 18:50:13 +09:00 |
Vincent Yang
|
2ba6f266ad
|
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
|
2015-06-30 14:32:14 +08:00 |
子龙山人
|
950cb840c2
|
Merge pull request #12582 from super626/listview
fix camera mask of listview
|
2015-06-30 10:25:57 +08:00 |
子龙山人
|
c997284825
|
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
Improve ui::Slider
|
2015-06-29 17:01:27 +08:00 |
yangxiao
|
a56a5d24b6
|
fix camera mask of listview
|
2015-06-29 14:41:03 +08:00 |
andyque
|
60834e6f0c
|
Merge branch 'v3' into v3-finish-android-9-patch-image-format
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-29 12:05:52 +08:00 |
andyque
|
30d2129f0c
|
improve indent and getTime function
|
2015-06-29 11:52:53 +08:00 |
pandamicro
|
4b34963329
|
Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi
use inch for childFocusCancelOffset in UIScrollView
|
2015-06-26 08:11:00 +08:00 |
pandamicro
|
3136bef9e3
|
Fix convertDistanceFromPointToInch logic (add x, y)
|
2015-06-25 21:34:00 +08:00 |
pandamicro
|
e29284374b
|
Fix convertDistanceFromPointToInch logic
|
2015-06-25 20:57:23 +08:00 |
samuele3hu
|
3a654b4615
|
Fix the compile error of js-template by using android-studio compile param.
|
2015-06-25 17:44:51 +08:00 |
andyque
|
d83f528327
|
use inch for childFocusCancelOffset in UIScrollView
|
2015-06-25 16:57:00 +08:00 |
andyque
|
7fff2bd3c4
|
fix nine patch image parser error on Windows.
|
2015-06-23 15:42:58 +08:00 |
Neo Kim
|
9757be0f81
|
Remove debugging logs
|
2015-06-22 14:49:30 +09:00 |
Neo Kim
|
71c98da2aa
|
Apply ease out action on inertia scroll
|
2015-06-22 14:30:45 +09:00 |
Neo Kim
|
c4fa99444c
|
Simplify the inertia scroll implementation
|
2015-06-22 14:30:36 +09:00 |
Neo Kim
|
c70c923674
|
Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature.
|
2015-06-22 14:30:30 +09:00 |
Neo Kim
|
7422b20da9
|
Refactor some functions
|
2015-06-22 14:27:19 +09:00 |
Neo Kim
|
85fc5b3f89
|
Change to comply to Cocos2d-x convention
|
2015-06-22 14:27:11 +09:00 |
Neo Kim
|
6c212a7ddb
|
Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back.
It does what the existing code did including scroll event dispatching and attenuating.
|
2015-06-22 14:27:00 +09:00 |
Neo Kim
|
1058ab9172
|
Add necessary member variables and methods
|
2015-06-22 14:26:51 +09:00 |
Neo Kim
|
a8f77710f5
|
Refactor some functions and remove redundant codes
|
2015-06-22 14:10:25 +09:00 |
Neo Kim
|
876c94f352
|
Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back.
|
2015-06-22 14:05:53 +09:00 |
Neo Kim
|
ff3f990142
|
Add isOutOfBoundary() functions
|
2015-06-22 14:05:53 +09:00 |