Sergey
8270355ad6
blending function for Scale9Sprite
2015-03-05 11:13:51 +03:00
cpascal
db9985d7cd
Added new line with the left curl bracket.
2015-03-03 20:39:25 +09:00
cpascal
a6ee1451f4
changed one more indentation.
...
I made mistake, (now replacing the spaces to tab)
2015-03-03 13:44:43 +09:00
cpascal
4058e16f16
Added line break & removed function call in compare operator.
2015-03-03 13:40:40 +09:00
Mazyad Alabduljaleel
9d5fdcb973
Support Color4B for editbox text
2015-03-02 15:31:59 +04:00
Mazyad Alabduljaleel
4387844176
Fix editbox on Mac
2015-03-01 23:56:18 +04:00
yangxiao
f13237c013
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-02-26 17:27:42 +08:00
pandamicro
9bf22a51ea
Fix ListView::setDirection issue
2015-02-25 16:17:43 +08:00
cpascal
8d9da362e5
changed indentation.
2015-02-23 11:55:27 +09:00
cpascal
e7a39287f1
Fixed missing ui::EditBox functionalities on Win32
...
1. There was 100-byte input limit at ui::EditBoxImplWin::openKeyboard()
2. Implemented MaxLength as LengthFilter, not ByteFilter. (same as
Android's InputFilter - LengthFilter)
3. Users can input unicode characters that is not supported by CP_ACP.
2015-02-16 18:21:26 +09:00
lvlong
ee03bb8eea
setCameraMask for cocostudio-ui
2015-02-12 09:24:04 +08:00
minggo
8d681dfe7d
Merge pull request #10218 from andyque/fixIssue10183
...
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
2015-01-28 09:57:34 +08:00
minggo
880abfe814
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
...
Fix loading bar reload texture issue
2015-01-27 13:50:38 +08:00
minggo
e1afb7c789
Merge pull request #10226 from andyque/removeDuplicateCode
...
remove unused code
2015-01-27 13:50:15 +08:00
andyque
7b81f3a811
remove unused code
2015-01-27 10:17:41 +08:00
cpascal
d857164768
Added override of ui::EditBox::getDescription()
2015-01-27 11:10:04 +09:00
andyque
95e8072afa
fixed issue #10183
2015-01-26 18:26:59 +08:00
andyque
732050d940
don't release the scale9Image when updateSprites
2015-01-26 16:04:43 +08:00
andyque
0e67cfcbff
improve loading Bar Test
2015-01-26 14:39:44 +08:00
minggo
cba0e19252
Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield
...
Change the order of detach and attach of TextField::upadate
2015-01-26 14:00:58 +08:00
minggo
4ac50f2c26
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
...
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
andyque
fdbf84a118
add uploading switch scale9 tests
2015-01-26 13:49:54 +08:00
Wenhai Lin
81198583f1
Fixed sets the page's base URL for WebView doesn't work.
2015-01-23 18:30:12 +08:00
minggo
516c6f1387
Merge pull request #10187 from joshuastray/fix-win32-editbox-clip
...
Fix win32 editbox content not clipped correctly
2015-01-23 16:16:00 +08:00
Jialong Zhai
b295c8e817
fix indentation
2015-01-23 14:13:36 +08:00
Jialong Zhai
7ef80e9dae
Update UIEditBoxImpl-win32.cpp
2015-01-23 14:11:22 +08:00
andyque
94e35d8d95
fix slider scale9 render
2015-01-22 15:53:33 +08:00
minggo
72fb059aeb
Merge pull request #10144 from andyque/fixButtonPressActionIssue
...
fix button pressAction scale issue
2015-01-21 16:37:59 +08:00
andyque
d58426db99
fix button pressAction scale issue
2015-01-21 14:54:37 +08:00
andyque
7f7506fb99
fix progress bar render issue when switch scale9
2015-01-21 13:41:40 +08:00
minggo
dca1edccd7
Merge pull request #10113 from liamcindy/Scale9Error
...
update for ui object scale9 state refresh
2015-01-21 10:51:55 +08:00
minggo
e8b6705d29
Merge pull request #10071 from liamcindy/Text_2.4
...
fix uitext size error
2015-01-21 09:40:34 +08:00
minggo
eb2ca9eef5
Merge pull request #10069 from liamcindy/Button_2.4
...
add function for ui button
2015-01-21 09:36:35 +08:00
minggo
6870692cfe
Merge pull request #10072 from liamcindy/TextBMFont
...
BMFont need to refresh size by refresh the string
2015-01-21 09:32:54 +08:00
minggo
b61a28633e
Merge pull request #10102 from andyque/addListViewReuseCell
...
Refactoring bad coding style
2015-01-21 09:24:56 +08:00
Liam
902fba0638
fix slider and loadingbar scale9 error
2015-01-20 20:57:54 +08:00
Liam
a72e65b4de
add function for uiText and uiTextField
2015-01-20 18:40:25 +08:00
Liam
a42d213d16
update for ui object scale9 state refresh
2015-01-20 17:24:04 +08:00
andyque
9a43706db8
refactor variable names of ui::Scale9Sprite
2015-01-20 15:29:25 +08:00
minggo
7dee9d2356
Merge pull request #10074 from liamcindy/LayoutComponent_2.4
...
update for lay out component
2015-01-20 15:12:49 +08:00
andyque
38906dce45
refactor for scale9Sprite
2015-01-20 15:10:03 +08:00
andyque
1fb30c61f7
clean up coding style
2015-01-20 14:24:10 +08:00
andyque
221e7a4310
refactor remedyLayoutParamter function
2015-01-20 14:24:10 +08:00
Liam
81f3995cc1
update uiTextBMFont setString
2015-01-20 14:20:20 +08:00
Liam
118b74e95c
update uiTextBMFont setFontFile
2015-01-20 13:55:39 +08:00
minggo
a3046730d7
Merge pull request #10073 from liamcindy/Widget_2.4
...
the ui widget need to refresh size by ignore state
2015-01-20 11:23:23 +08:00
Liam
3b0ba72b01
update for lay out component
2015-01-19 17:11:04 +08:00
Liam
62020483fc
the ui widget need to refresh size by ignore state
2015-01-19 17:09:15 +08:00
Liam
d38b802780
BMFont need to refresh size by refresh the string
2015-01-19 17:07:15 +08:00
Liam
e8fa6597df
fix uitext size error
2015-01-19 17:02:28 +08:00
Liam
987bfd4831
fix imageview render error
2015-01-19 17:00:53 +08:00
Liam
90df276067
add function for ui button
2015-01-19 16:58:46 +08:00
andyque
3f99f3d454
fix crash when navigation controller is null
2015-01-15 15:18:14 +08:00
Jialong Zhai
6f99e161f8
Change the order of detach and attach of TextField::upadate
2015-01-12 10:18:55 +08:00
andyque
0f49bb977d
improve ui::Text and ui::TextField creation performance
2015-01-07 17:21:41 +08:00
minggo
7ab4e0de3a
Merge pull request #9634 from andyque/fixIssue9628
...
fix setTitleColor calls method setColor instead of setTextColor of title label.
2014-12-29 11:24:36 +08:00
minggo
491d36c62b
Merge pull request #9626 from liamcindy/CocoReader
...
update for cocos reader
2014-12-26 09:29:37 +08:00
andyque
29e9ef7edf
Merge branch 'v3' into modifyWidgetDefaultBehavior
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
andyque
3f0f7c289f
change setColor to setTextColor
2014-12-25 16:07:34 +08:00
Liam
fa85faec68
update for cocos reader
2014-12-25 15:02:22 +08:00
minggo
bb9fb9f0d6
Merge pull request #9591 from liamcindy/Layout
...
update for lay out
2014-12-24 14:27:08 +08:00
Liam
dcd544cc66
update ui widget function format
2014-12-24 11:12:14 +08:00
Liam
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
Liam
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
minggo
ca932a38e4
Merge pull request #9538 from andyque/fixCapInsetSize
...
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-23 14:44:32 +08:00
minggo
90a7f99873
Merge pull request #9570 from liamcindy/UIListView
...
override function for listview
2014-12-23 14:25:46 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
Liam
377d8ec3c0
Merge branch 'UILayout' into UILayout_Widget
2014-12-22 19:22:09 +08:00
Liam
39d0f183d4
update for code format
2014-12-22 19:05:31 +08:00
Liam
0465ff8325
remote unuseful format
2014-12-22 18:39:44 +08:00
Liam
f5a242be97
update for widget percent position and size logic
2014-12-22 15:23:26 +08:00
Liam
5a73ea9313
reset widget chaned
2014-12-22 15:04:25 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
Liam
7c4d31feab
update for lay out samples
2014-12-22 14:51:50 +08:00
Liam
56e42b0a0a
update for lay out
2014-12-22 11:20:03 +08:00
Liam
8d8215b148
override function for listview
2014-12-22 09:55:29 +08:00
joewanchen
c2473b9b99
fix.
2014-12-21 01:03:30 +08:00
andyque
b11e3d74cc
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-17 16:46:48 +08:00
minggo
d9953d4aac
Merge pull request #9519 from andyque/addNewRequirements
...
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-17 09:53:31 +08:00
minggo
116ff0de63
Merge pull request #9439 from andyque/addcreateMethodToLoadingBar
...
add TextureResType to LoadingBar's create method
2014-12-16 18:31:20 +08:00
andyque
16cf396ed7
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-16 16:44:04 +08:00
Edward Zhou
1ca92411fc
Fix UIText miss copy contentSize for clone
2014-12-11 13:33:28 +08:00
minggo
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
andyque
989c05cd2d
add TextureResType to LoadingBar
2014-12-10 10:21:17 +08:00
andyque
d53d71610b
Merge branch 'v3' into fixEditBox_v3
2014-12-08 15:20:06 +08:00
yusheng.lu
2f456a5668
ListViewReader completed and listview callback feature.
2014-12-05 19:31:10 +08:00
Liam
be929dcde6
update for cocos reader
2014-12-05 19:19:53 +08:00
pipu
915449f77a
Modify UICheckBox
2014-12-02 12:23:15 +08:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
andyque
1bb60ab4bb
add null pointer check, make code more robust
2014-11-27 18:25:13 +08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
andyque
e118b085b8
add UIText bug fix tests
2014-11-26 15:05:20 +08:00
andyque
a2883aa097
fix UIText dimension error when set ignoreContentSize to false
2014-11-26 13:41:24 +08:00
Haneol Park
a6e4b31b0d
Additional unnecessary set dirty of ui widgets
2014-11-25 20:42:03 +09:00
Haneol Park
d25fdca4af
Unnecessary set dirty of ui widget
2014-11-25 17:50:46 +09:00
minggo
74e7aa6db9
Merge pull request #9205 from Dhilan007/v3-scriptfix
...
replace tab with four spaces
2014-11-24 15:22:00 +08:00
minggo
b8bb61c7c6
Merge pull request #9028 from andyque/fixWidgetFlipIssue
...
Fix widget flip issue
2014-11-24 15:19:50 +08:00
Dhilan007
4e769d40b1
replace tab with four spaces
2014-11-24 11:26:34 +08:00
minggo
87f70cfaec
Merge pull request #9113 from Dhilan007/v3-scriptfix
...
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
2014-11-24 10:09:19 +08:00
Vladimir Timofeev
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
Dhilan007
ac0fb68989
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
2014-11-14 15:04:32 +08:00
Vladimir Timofeev
dba8ef33bd
cmake: connect mac specific UIEditBox implementation to build
2014-11-11 10:30:48 +03:00
Xavier Arias Botargues
dd25ff7a39
Fixed retina/contentScale position errors for iPhone 6+ devices in EditBox.
...
Problem is that factor was 1.0 or 2.0 until iOS 8 introduced 3.0.
2014-11-07 12:08:31 +01:00
andyque
9c3c693a21
refactor Widget flip logic
2014-11-07 11:11:51 +08:00
andyque
5483bc834d
fix scale9sprite flip issue
2014-11-07 11:09:22 +08:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
minggo
87d7b7e8ee
Merge pull request #8973 from joshuastray/fix_constructor_access
...
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-31 10:26:32 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
Jialong Zhai
ce85ea3946
fix indentation
2014-10-30 14:38:55 +08:00
Jialong Zhai
4113929fc0
Update UIVideoPlayer.h
2014-10-30 14:36:15 +08:00
Jialong Zhai
fd238cab36
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-30 14:24:37 +08:00
Liam
19ed3d1965
udpate for ui button state change event
2014-10-27 11:16:25 +08:00
Liam
57e6631918
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-10-25 19:01:18 +08:00
Liam
f1970e98dd
update for ui button press event
2014-10-25 18:00:57 +08:00
Liam
92bdfea638
update ui button size changed logic
2014-10-24 17:38:32 +08:00
Dale Stammen
6fcd0ebafd
don't hide flyout when keyboard is hidden
2014-10-23 22:23:42 -07:00
Dale Stammen
5df4278e36
fixed reentrancy when closing flyout
2014-10-23 22:17:25 -07:00
Dale Stammen
b77e7a5a97
fixed reentrancy when closing flyout
2014-10-23 22:01:35 -07:00
Dale Stammen
afa052c5c7
added critical section
2014-10-23 20:49:10 -07:00
Dale Stammen
6e92d169cd
changed implementation to use xaml flyout for editbox
2014-10-23 19:30:32 -07:00
Dale Stammen
d2f852c3cb
added editbox support for universal apps
2014-10-23 07:39:38 -07:00
Dale Stammen
9b2adef6b2
added CC_PLATFORM_WINRT
2014-10-23 07:15:58 -07:00
minggo
db8dc25b01
fix warning
2014-10-21 11:40:34 +08:00
minggo
bca15538e3
Merge pull request #8823 from super626/v3
...
add isVisibleByVisitingCamera check
2014-10-18 15:11:45 +08:00
samuele3hu
529ee72432
Fix compile error triggered by UIHelper.cpp
2014-10-18 00:25:55 +08:00
Liam
3089317eb7
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3
2014-10-17 19:18:12 +08:00
Liam
3f954857a8
update for lay out
2014-10-17 19:13:37 +08:00
yangxiao
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
yangxiao
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
minggo
31664d979a
Merge pull request #8783 from andyque/adjustUITestProject
...
fix scrollView rotate issue
2014-10-17 14:54:32 +08:00
minggo
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +08:00
andyque
952e52365b
fix scrollView rotate issue
2014-10-17 14:02:49 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
Dhilan007
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
Dale Stammen
8700c0b07e
added check for WinRT and WP8
2014-10-14 14:22:19 -07:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
minggo
1d5652ad48
Merge pull request #8635 from ahlwong/v3
...
Fix UIButton setFontSize sync ContentSize
2014-10-13 17:25:18 +08:00
pipu
96c8fde63a
1. Modifying UIButton.cpp
...
2. Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
2014-10-13 12:49:15 +08:00
pipu
8040955062
Modifying cocos/editor-support/cocostudio/CMakeLists.txt, cocos/ui/CMakeLists.txt
2014-10-12 20:21:32 +08:00
pipu
2d51724686
1. Update wp8 projects.
2014-10-12 19:32:13 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
minggo
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
pipu
ab969db441
Modifying ImageViewReader, UIImageView
2014-10-11 15:43:37 +08:00
pipu
29eb552d00
1. Modifying ButtonReader
...
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
2014-10-11 15:35:09 +08:00
Ahlwong
dd5c5a29b9
Refactor UIButton ContentSize update
2014-10-10 21:13:04 -07:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00