Skip to content

Commit cf1049f

Browse files
drelaptopminggo
authored andcommitted
add folder ref for Xcode, unify code style (#18617)
1 parent 3d63730 commit cf1049f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

build/cocos2d_tests.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@
695695
3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
696696
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
697697
3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; };
698+
400308D820060F12000DFE6D /* strings in Resources */ = {isa = PBXBuildFile; fileRef = 400308D720060F12000DFE6D /* strings */; };
698699
460629781CDB4DBA00B44058 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 460629771CDB4DBA00B44058 /* ccs-res */; };
699700
460629791CDB4DBA00B44058 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 460629771CDB4DBA00B44058 /* ccs-res */; };
700701
463D7E7C1D227C5F00EA6BD1 /* Bug-14327.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E781D227C3800EA6BD1 /* Bug-14327.cpp */; };
@@ -2226,6 +2227,7 @@
22262227
3EA0FB65191B933000B170C8 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; };
22272228
3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = "<group>"; };
22282229
3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayerTest.h; sourceTree = "<group>"; };
2230+
400308D720060F12000DFE6D /* strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = strings; path = "../tests/cpp-tests/Resources/strings"; sourceTree = "<group>"; };
22292231
460629771CDB4DBA00B44058 /* ccs-res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ccs-res"; path = "../tests/cpp-tests/Resources/ccs-res"; sourceTree = "<group>"; };
22302232
463D7E781D227C3800EA6BD1 /* Bug-14327.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-14327.cpp"; sourceTree = "<group>"; };
22312233
463D7E791D227C3800EA6BD1 /* Bug-14327.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-14327.h"; sourceTree = "<group>"; };
@@ -3941,6 +3943,7 @@
39413943
1AC35CA818CED83500F37B72 /* Resources */ = {
39423944
isa = PBXGroup;
39433945
children = (
3946+
400308D720060F12000DFE6D /* strings */,
39443947
38FA2E75194AECF800FF2BE4 /* ActionTimeline */,
39453948
1AC35CA918CED84500F37B72 /* animations */,
39463949
3E2BDAD119BEA3E20055CDCD /* audio */,
@@ -5697,6 +5700,7 @@
56975700
1AC35CD218CED84500F37B72 /* background.ogg in Resources */,
56985701
1AC35D0018CED84500F37B72 /* pew-pew-lei.wav in Resources */,
56995702
1AC35CD018CED84500F37B72 /* background.mp3 in Resources */,
5703+
400308D820060F12000DFE6D /* strings in Resources */,
57005704
1AC35CD618CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */,
57015705
3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */,
57025706
1AC35CA318CECF1E00F37B72 /* InfoPlist.strings in Resources */,

tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,9 +596,9 @@ bool LabelFNTMultiLineAlignment::init()
596596

597597
MenuItemFont::setFontSize(30);
598598

599-
auto left = MenuItemFont::create("Left", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
599+
auto left = MenuItemFont::create("Left", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
600600
auto center = MenuItemFont::create("Center", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
601-
auto right = MenuItemFont::create("Right", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
601+
auto right = MenuItemFont::create("Right", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
602602

603603
auto alignmentMenu = Menu::create(left, center, right, nullptr);
604604
alignmentMenu->alignItemsHorizontallyWithPadding(alignmentItemPadding);

0 commit comments

Comments
 (0)