Skip to content

Commit

Permalink
CoreAnimationTest update - disable unsupported CALayer controls; adds…
Browse files Browse the repository at this point in the history
… a header and footer table entry; affine transformations update (#1874)

* CoreAnimationTest update - disable unsupported CALayer controls; adds a header and footer table entry; affine transformations update

CHANGES:
1. Supports the enabling/disabling of layer property controls (greyed out if disabled)
2. Custom table view cells for header and footer added - view and number of layers
3. Affine transformations are now applied collectively, 3D transformation still require it to be centered at origin
4. Cosmetic updates and autolayout corrections - IslandWood autolayout still has some quirks (see CGRect- and CGPoint- cells)
5. All specialized layers extracted from external sources are marked as "not supported" even if render partially

Fixes #1598

* Code review feedback
  • Loading branch information
oliversa-msft authored Feb 10, 2017
1 parent 58e461e commit 02175d6
Show file tree
Hide file tree
Showing 18 changed files with 582 additions and 322 deletions.
30 changes: 15 additions & 15 deletions samples/CoreAnimationTest/CoreAnimationTest-WinStore10.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CoreAnimationTest", "CoreAnimationTest", "{45F6ED04-F5A2-4DA2-85FE-7D18A0366C39}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CoreAnimationTest", "CoreAnimationTest", "{769D8E30-5393-4849-94AE-E81CC25D3CB7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoreAnimationTest", "CoreAnimationTest.vsimporter\CoreAnimationTest-WinStore10\CoreAnimationTest.vcxproj", "{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoreAnimationTest", "CoreAnimationTest.vsimporter\CoreAnimationTest-WinStore10\CoreAnimationTest.vcxproj", "{C23ED109-41BE-42F6-B24A-4A30F45B7653}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Expand All @@ -16,23 +16,23 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Debug|ARM.ActiveCfg = Debug|ARM
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Debug|ARM.Build.0 = Debug|ARM
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Debug|ARM.Deploy.0 = Debug|ARM
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Debug|Win32.ActiveCfg = Debug|Win32
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Debug|Win32.Build.0 = Debug|Win32
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Debug|Win32.Deploy.0 = Debug|Win32
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Release|ARM.ActiveCfg = Release|ARM
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Release|ARM.Build.0 = Release|ARM
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Release|ARM.Deploy.0 = Release|ARM
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Release|Win32.ActiveCfg = Release|Win32
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Release|Win32.Build.0 = Release|Win32
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}.Release|Win32.Deploy.0 = Release|Win32
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Debug|ARM.ActiveCfg = Debug|ARM
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Debug|ARM.Build.0 = Debug|ARM
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Debug|ARM.Deploy.0 = Debug|ARM
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Debug|Win32.ActiveCfg = Debug|Win32
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Debug|Win32.Build.0 = Debug|Win32
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Debug|Win32.Deploy.0 = Debug|Win32
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Release|ARM.ActiveCfg = Release|ARM
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Release|ARM.Build.0 = Release|ARM
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Release|ARM.Deploy.0 = Release|ARM
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Release|Win32.ActiveCfg = Release|Win32
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Release|Win32.Build.0 = Release|Win32
{C23ED109-41BE-42F6-B24A-4A30F45B7653}.Release|Win32.Deploy.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5} = {45F6ED04-F5A2-4DA2-85FE-7D18A0366C39}
{C23ED109-41BE-42F6-B24A-4A30F45B7653} = {769D8E30-5393-4849-94AE-E81CC25D3CB7}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
<Keyword>IslandwoodProj</Keyword>
<ProjectGuid>{F2CBB61E-B078-4CA8-8AF4-FE582E5966E5}</ProjectGuid>
<ProjectGuid>{C23ED109-41BE-42F6-B24A-4A30F45B7653}</ProjectGuid>
<RootNamespace>CoreAnimationTest</RootNamespace>
<WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
</PropertyGroup>
Expand Down Expand Up @@ -199,6 +199,8 @@
<ClInclude Include="..\..\CoreAnimationTest\CGPointTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\CGRectTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\Constants.h" />
<ClInclude Include="..\..\CoreAnimationTest\FooterTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\HeaderTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\LayerTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\MenuTableViewController.h" />
<ClInclude Include="..\..\CoreAnimationTest\PickerViewTableViewCell.h" />
Expand All @@ -209,7 +211,6 @@
<ClInclude Include="..\..\CoreAnimationTest\StoryBoardViewController.h" />
<ClInclude Include="..\..\CoreAnimationTest\StringTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\SwitchTableViewCell.h" />
<ClInclude Include="..\..\CoreAnimationTest\ViewHeaderFooterView.h" />
<ClangCompile Include="..\..\CoreAnimationTest\AppDelegate.m" />
<ClangCompile Include="..\..\CoreAnimationTest\CAEmitterLayerControlsViewController.m" />
<ClangCompile Include="..\..\CoreAnimationTest\CAEmitterLayerViewController.m" />
Expand All @@ -221,6 +222,8 @@
<ClangCompile Include="..\..\CoreAnimationTest\CGPointTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\CGRectTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\Constants.m" />
<ClangCompile Include="..\..\CoreAnimationTest\FooterTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\HeaderTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\LayerTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\MenuTableViewController.m" />
<ClangCompile Include="..\..\CoreAnimationTest\PickerViewTableViewCell.m" />
Expand All @@ -231,7 +234,6 @@
<ClangCompile Include="..\..\CoreAnimationTest\StoryBoardViewController.m" />
<ClangCompile Include="..\..\CoreAnimationTest\StringTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\SwitchTableViewCell.m" />
<ClangCompile Include="..\..\CoreAnimationTest\ViewHeaderFooterView.m" />
<ClangCompile Include="..\..\CoreAnimationTest\main.m" />
<SBInfoPlistCopy Include="..\..\CoreAnimationTest\Info.plist">
<ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">false</ExcludedFromBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Common">
<UniqueIdentifier>{30bb36d5-430d-4c1e-be24-5116d7f08678}</UniqueIdentifier>
<UniqueIdentifier>{7a0a4a48-3dc8-4fa0-b54c-ef5e452c750f}</UniqueIdentifier>
</Filter>
<Filter Include="Assets">
<UniqueIdentifier>{438b2c9d-69ec-4e2c-94f8-e394a4cb4b65}</UniqueIdentifier>
<UniqueIdentifier>{c75d19c7-ecb3-4e32-83f8-f9c55d7a7565}</UniqueIdentifier>
</Filter>
<Filter Include="CoreAnimationTest">
<UniqueIdentifier>{C25D6FE0-D89F-4D10-8D9D-C097EC9BAC48}</UniqueIdentifier>
<UniqueIdentifier>{C9B3AC0D-899F-4E90-854E-19F14B373212}</UniqueIdentifier>
</Filter>
<Filter Include="CoreAnimationTest\Supporting Files">
<UniqueIdentifier>{92945B02-B427-444B-8EDA-B5A5080181CE}</UniqueIdentifier>
<UniqueIdentifier>{C90BA809-719A-47D6-B674-C657027E3DC7}</UniqueIdentifier>
</Filter>
<Filter Include="Images">
<UniqueIdentifier>{8004D3FE-52AE-4487-8D65-A833F6F5C6C1}</UniqueIdentifier>
<UniqueIdentifier>{EB50F64C-F6BC-4DB1-AB01-7A6A0907C55B}</UniqueIdentifier>
</Filter>
<Filter Include="Xcode Variable Files">
<UniqueIdentifier>{50E1085B-DC0A-4CFE-98B2-93A106EA0EAC}</UniqueIdentifier>
<UniqueIdentifier>{DC9C4FEC-C732-4C7B-84DA-C08B143DCB71}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -78,6 +78,12 @@
<ClInclude Include="..\..\CoreAnimationTest\Constants.h">
<Filter>CoreAnimationTest</Filter>
</ClInclude>
<ClInclude Include="..\..\CoreAnimationTest\FooterTableViewCell.h">
<Filter>CoreAnimationTest</Filter>
</ClInclude>
<ClInclude Include="..\..\CoreAnimationTest\HeaderTableViewCell.h">
<Filter>CoreAnimationTest</Filter>
</ClInclude>
<ClInclude Include="..\..\CoreAnimationTest\LayerTableViewCell.h">
<Filter>CoreAnimationTest</Filter>
</ClInclude>
Expand Down Expand Up @@ -108,9 +114,6 @@
<ClInclude Include="..\..\CoreAnimationTest\SwitchTableViewCell.h">
<Filter>CoreAnimationTest</Filter>
</ClInclude>
<ClInclude Include="..\..\CoreAnimationTest\ViewHeaderFooterView.h">
<Filter>CoreAnimationTest</Filter>
</ClInclude>
<ClangCompile Include="..\..\CoreAnimationTest\AppDelegate.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
Expand Down Expand Up @@ -144,6 +147,12 @@
<ClangCompile Include="..\..\CoreAnimationTest\Constants.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
<ClangCompile Include="..\..\CoreAnimationTest\FooterTableViewCell.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
<ClangCompile Include="..\..\CoreAnimationTest\HeaderTableViewCell.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
<ClangCompile Include="..\..\CoreAnimationTest\LayerTableViewCell.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
Expand Down Expand Up @@ -174,9 +183,6 @@
<ClangCompile Include="..\..\CoreAnimationTest\SwitchTableViewCell.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
<ClangCompile Include="..\..\CoreAnimationTest\ViewHeaderFooterView.m">
<Filter>CoreAnimationTest</Filter>
</ClangCompile>
<ClangCompile Include="..\..\CoreAnimationTest\main.m">
<Filter>CoreAnimationTest\Supporting Files</Filter>
</ClangCompile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
IgnorableNamespaces="uap mp">

<Identity
Name="8fdf34a8-24d3-4f22-8329-17f0432bff09"
Name="4b10b58c-5279-4801-a6c2-7a6a1d738703"
Publisher="CN=islandwood"
Version="1.0.0.0" />

<mp:PhoneIdentity PhoneProductId="8fdf34a8-24d3-4f22-8329-17f0432bff09" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<mp:PhoneIdentity PhoneProductId="4b10b58c-5279-4801-a6c2-7a6a1d738703" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

<Properties>
<DisplayName>CoreAnimationTest</DisplayName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@
233DE3641DD15E5A00680F5E /* StringTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 233DE35F1DD15E5A00680F5E /* StringTableViewCell.m */; };
233DE3651DD15E5A00680F5E /* SwitchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 233DE3611DD15E5A00680F5E /* SwitchTableViewCell.m */; };
233DE3661DD15E5A00680F5E /* CALayerMultipleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 233DE3631DD15E5A00680F5E /* CALayerMultipleViewController.m */; };
233DE36C1DD3D9F700680F5E /* ViewHeaderFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 233DE36B1DD3D9F700680F5E /* ViewHeaderFooterView.m */; };
233DE36E1DD5153400680F5E /* 3x3grid.png in Resources */ = {isa = PBXBuildFile; fileRef = 233DE36D1DD5153400680F5E /* 3x3grid.png */; };
233DE3761DDAA42300680F5E /* CGPointTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 233DE3731DDAA42300680F5E /* CGPointTableViewCell.m */; };
233DE3771DDAA42300680F5E /* CGRectTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 233DE3751DDAA42300680F5E /* CGRectTableViewCell.m */; };
348AD6C71E2831AC00ABC130 /* HeaderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 348AD6C61E2831AC00ABC130 /* HeaderTableViewCell.m */; };
348AD6CA1E28383A00ABC130 /* FooterTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 348AD6C91E28383A00ABC130 /* FooterTableViewCell.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -93,13 +94,15 @@
233DE3611DD15E5A00680F5E /* SwitchTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwitchTableViewCell.m; sourceTree = "<group>"; };
233DE3621DD15E5A00680F5E /* CALayerMultipleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CALayerMultipleViewController.h; sourceTree = "<group>"; };
233DE3631DD15E5A00680F5E /* CALayerMultipleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CALayerMultipleViewController.m; sourceTree = "<group>"; };
233DE36A1DD3D9F700680F5E /* ViewHeaderFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewHeaderFooterView.h; sourceTree = "<group>"; };
233DE36B1DD3D9F700680F5E /* ViewHeaderFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewHeaderFooterView.m; sourceTree = "<group>"; };
233DE36D1DD5153400680F5E /* 3x3grid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 3x3grid.png; path = CoreAnimationTest/Images/3x3grid.png; sourceTree = "<group>"; };
233DE3721DDAA42300680F5E /* CGPointTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGPointTableViewCell.h; sourceTree = "<group>"; };
233DE3731DDAA42300680F5E /* CGPointTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CGPointTableViewCell.m; sourceTree = "<group>"; };
233DE3741DDAA42300680F5E /* CGRectTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGRectTableViewCell.h; sourceTree = "<group>"; };
233DE3751DDAA42300680F5E /* CGRectTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CGRectTableViewCell.m; sourceTree = "<group>"; };
348AD6C51E2831AC00ABC130 /* HeaderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderTableViewCell.h; sourceTree = "<group>"; };
348AD6C61E2831AC00ABC130 /* HeaderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HeaderTableViewCell.m; sourceTree = "<group>"; };
348AD6C81E28383A00ABC130 /* FooterTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FooterTableViewCell.h; sourceTree = "<group>"; };
348AD6C91E28383A00ABC130 /* FooterTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FooterTableViewCell.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -159,6 +162,10 @@
2312E1361DAD95AC00998C74 /* Info.plist */,
233DE3521DD15E2E00680F5E /* LayerTableViewCell.h */,
233DE3531DD15E2E00680F5E /* LayerTableViewCell.m */,
348AD6C51E2831AC00ABC130 /* HeaderTableViewCell.h */,
348AD6C61E2831AC00ABC130 /* HeaderTableViewCell.m */,
348AD6C81E28383A00ABC130 /* FooterTableViewCell.h */,
348AD6C91E28383A00ABC130 /* FooterTableViewCell.m */,
2312E13C1DAD988B00998C74 /* MenuTableViewController.h */,
2312E13D1DAD988B00998C74 /* MenuTableViewController.m */,
233DE3551DD15E3C00680F5E /* PickerViewTableViewCell.h */,
Expand All @@ -177,8 +184,6 @@
233DE35F1DD15E5A00680F5E /* StringTableViewCell.m */,
233DE3601DD15E5A00680F5E /* SwitchTableViewCell.h */,
233DE3611DD15E5A00680F5E /* SwitchTableViewCell.m */,
233DE36A1DD3D9F700680F5E /* ViewHeaderFooterView.h */,
233DE36B1DD3D9F700680F5E /* ViewHeaderFooterView.m */,
2312E1251DAD95AC00998C74 /* Supporting Files */,
);
path = CoreAnimationTest;
Expand Down Expand Up @@ -288,8 +293,10 @@
files = (
2312E1451DADC5C400998C74 /* ProgrammaticViewController.m in Sources */,
233DE3571DD15E3C00680F5E /* PickerViewTableViewCell.m in Sources */,
348AD6CA1E28383A00ABC130 /* FooterTableViewCell.m in Sources */,
2312E12A1DAD95AC00998C74 /* AppDelegate.m in Sources */,
2312E16F1DB6F88300998C74 /* ScrollingView.m in Sources */,
348AD6C71E2831AC00ABC130 /* HeaderTableViewCell.m in Sources */,
2312E1691DB6F87600998C74 /* CAEmitterLayerViewController.m in Sources */,
2312E14F1DB1733D00998C74 /* CALayerAnimationViewController.m in Sources */,
2312E16B1DB6F87600998C74 /* CAShapeLayerViewController.m in Sources */,
Expand All @@ -298,7 +305,6 @@
2312E13E1DAD988B00998C74 /* MenuTableViewController.m in Sources */,
2312E1271DAD95AC00998C74 /* main.m in Sources */,
233DE3641DD15E5A00680F5E /* StringTableViewCell.m in Sources */,
233DE36C1DD3D9F700680F5E /* ViewHeaderFooterView.m in Sources */,
233DE3771DDAA42300680F5E /* CGRectTableViewCell.m in Sources */,
2312E1481DAED8D100998C74 /* CALayerViewController.m in Sources */,
233DE35A1DD15E4500680F5E /* PropertyTableViewCell.m in Sources */,
Expand Down
Loading

0 comments on commit 02175d6

Please sign in to comment.