Skip to content

Commit cc4f50d

Browse files
jeffstalljeffstall
committed
//build start
1 parent 9f4aec3 commit cc4f50d

File tree

5 files changed

+43
-50
lines changed

5 files changed

+43
-50
lines changed

‎Samples/Islands/WpfCalculator/CalculatorDemo/CalculatorDemo.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,10 @@
9696
<DependentUpon>App.xaml</DependentUpon>
9797
<SubType>Code</SubType>
9898
</Compile>
99-
<Compile Include="App_Demo3.cs" />
100-
<Compile Include="HelmetScenario.cs" />
101-
<Compile Include="LottieIslandScenario.cs" />
10299
<Compile Include="MainWindow.cs">
103100
<DependentUpon>MainWindow.xaml</DependentUpon>
104101
<SubType>Code</SubType>
105102
</Compile>
106-
<Compile Include="MainWindow_Demo3.cs" />
107-
<Compile Include="MainWindow_Demo4.cs" />
108103
</ItemGroup>
109104
<ItemGroup>
110105
<Compile Include="MyTextBox.cs" />
@@ -118,9 +113,7 @@
118113
<DependentUpon>Settings.settings</DependentUpon>
119114
<DesignTimeSharedInput>True</DesignTimeSharedInput>
120115
</Compile>
121-
<Compile Include="SceneNodeCommon.cs" />
122116
<!-- Demo4_Step2_AddIsland -->
123-
<Compile Include="WpfIslandHost.cs" />
124117
<!-- -->
125118
<EmbeddedResource Include="Properties\Resources.resx">
126119
<Generator>ResXFileCodeGenerator</Generator>
@@ -143,7 +136,6 @@
143136
</ItemGroup>
144137
<!-- Demo4_Step2_AddIsland -->
145138
<ItemGroup>
146-
<ProjectReference Include="..\DrawingIslandCsProjection\DrawingIslandCsProjection.csproj" />
147139
<PackageReference Include="CommunityToolkit.WinAppSDK.LottieWinRT" Version="8.0.230819-rc-LottieIsland.7.g92a87e1883" />
148140
<PackageReference Include="CommunityToolkit.WinUI.Lottie" Version="8.0.230819-rc-LottieIsland.7.g92a87e1883" />
149141
</ItemGroup>

‎Samples/Islands/WpfCalculator/CalculatorDemo/MainWindow.xaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,20 @@
2626
<DockPanel Name="MyPanel">
2727
<Menu Name="MainMenu" DockPanel.Dock="Top">
2828
<MenuItem Header="File">
29-
<!-- Demo4_Step2_AddIsland -->
30-
<MenuItem Name="CreateDrawingIslandMenuItem" Click="CreateDrawingIslandMenuItem_Click" Header="Create DrawingIsland" />
29+
<!-- Demo4_Step2_AddIsland
3130
<MenuItem Name="CreateLottieIslandMenuItem" Click="CreateLottieIslandMenuItem_Click" Header="Create LottieIsland" />
32-
<MenuItem Name="CreateSceneNodeIslandMenuItem" Click="CreateSceneNodeIslandMenuItem_Click" Header="Create SceneNode" />
33-
<!-- -->
34-
<MenuItem Click="OnMenuExit" Header="Exit" />
31+
-->
32+
33+
<!--<MenuItem Name="CreateDrawingIslandMenuItem" Click="CreateDrawingIslandMenuItem_Click" Header="Create DrawingIsland" />-->
34+
<!--<MenuItem Name="CreateSceneNodeIslandMenuItem" Click="CreateSceneNodeIslandMenuItem_Click" Header="Create SceneNode" />-->
35+
<MenuItem Click="OnMenuExit" Header="Exit" />
3536
</MenuItem>
3637
<MenuItem Header="View">
3738
<MenuItem Name="StandardMenu" Click="OnMenuStandard" IsCheckable="true" IsChecked="True"
3839
Header="Standard" />
39-
<!-- Demo3_Step2_AddCompact -->
40+
<!-- Demo3_Step2_AddCompact
4041
<MenuItem Name="CompactView" Click="CompactView_Click" Header="Enter Compact View" />
41-
<!-- -->
42+
-->
4243
</MenuItem>
4344
<MenuItem Header="Help">
4445
<MenuItem Click="OnMenuAbout" Header="About" />
@@ -129,7 +130,7 @@
129130
</DockPanel>
130131

131132
<!-- This is what's shown when we enter the compat view mode-->
132-
<!-- Demo3_Step2_AddCompact -->
133+
<!-- Demo3_Step2_AddCompact
133134
<DockPanel Name="CompactPanel" Visibility="Collapsed">
134135
<DockPanel DockPanel.Dock="Top">
135136
<Button Name="ExitCompactViewButton" Click="ExitCompactViewButton_Click" DockPanel.Dock="Right">Restore</Button>
@@ -139,6 +140,6 @@
139140
<Border x:Name="CompactAreaBorder">
140141
</Border>
141142
</DockPanel>
142-
<!-- -->
143+
-->
143144
</Grid>
144145
</Window>

‎Samples/Islands/WpfCalculator/CalculatorDemo/MainWindow_Demo4.cs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@ namespace CalculatorDemo
1010
{
1111
public sealed partial class MainWindow : Window
1212
{
13-
private Microsoft.UI.Composition.Compositor _compositor = new Microsoft.UI.Composition.Compositor();
14-
private void CreateDrawingIslandMenuItem_Click(object sender, RoutedEventArgs e)
15-
{
16-
var wpfIslandHost = new WpfIslandHost(_compositor);
17-
var drawingIsland = new DrawingIslandComponents.DrawingIsland(_compositor);
18-
19-
DisplayAreaBorder.Child = wpfIslandHost;
20-
wpfIslandHost.DesktopChildSiteBridge.Connect(drawingIsland.Island);
21-
}
13+
private Microsoft.UI.Composition.Compositor _compositor = new();
2214

2315
private void CreateLottieIslandMenuItem_Click(object sender, RoutedEventArgs e)
2416
{
@@ -28,15 +20,6 @@ private void CreateLottieIslandMenuItem_Click(object sender, RoutedEventArgs e)
2820
DisplayAreaBorder.Child = wpfIslandHost;
2921
wpfIslandHost.DesktopChildSiteBridge.Connect(lottieContentIsland.Island);
3022
}
31-
32-
private async void CreateSceneNodeIslandMenuItem_Click(object sender, RoutedEventArgs e)
33-
{
34-
var wpfIslandHost = new WpfIslandHost(_compositor);
35-
var helmetIsland = await HelmetScenario.CreateIsland(_compositor);
36-
37-
DisplayAreaBorder.Child = wpfIslandHost;
38-
wpfIslandHost.DesktopChildSiteBridge.Connect(helmetIsland);
39-
}
4023
}
4124
}
4225

‎Samples/Islands/WpfCalculator/CalculatorDemo/MainWindow_Demo4_Extra.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// // Copyright (c) Microsoft. All rights reserved.
2+
// // Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System.Windows;
5+
6+
#if true // Demo3_Step2_AddCompact
7+
8+
namespace CalculatorDemo
9+
{
10+
public sealed partial class MainWindow : Window
11+
{
12+
private void CreateDrawingIslandMenuItem_Click(object sender, RoutedEventArgs e)
13+
{
14+
var wpfIslandHost = new WpfIslandHost(_compositor);
15+
var drawingIsland = new DrawingIslandComponents.DrawingIsland(_compositor);
16+
17+
DisplayAreaBorder.Child = wpfIslandHost;
18+
wpfIslandHost.DesktopChildSiteBridge.Connect(drawingIsland.Island);
19+
}
20+
21+
private async void CreateSceneNodeIslandMenuItem_Click(object sender, RoutedEventArgs e)
22+
{
23+
var wpfIslandHost = new WpfIslandHost(_compositor);
24+
var helmetIsland = await HelmetScenario.CreateIsland(_compositor);
25+
26+
DisplayAreaBorder.Child = wpfIslandHost;
27+
wpfIslandHost.DesktopChildSiteBridge.Connect(helmetIsland);
28+
}
29+
}
30+
}
31+
32+
#endif

‎Samples/Islands/WpfCalculator/WpfCalculator.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.9.34728.123
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DrawingIslandComponents", "DrawingIslandComponents\DrawingIslandComponents.vcxproj", "{709C54E1-0F2F-4A59-80B2-4CFD08B720E5}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawingIslandCsProjection", "DrawingIslandCsProjection\DrawingIslandCsProjection.csproj", "{48847923-880A-4A61-99CF-64B8EABD412B}"
9-
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalculatorDemo", "CalculatorDemo\CalculatorDemo.csproj", "{5731865D-6685-47A7-8877-5DBAF39B54CD}"
119
EndProject
1210
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CalculatorDemoPackage", "CalculatorDemoPackage\CalculatorDemoPackage.wapproj", "{0A343519-113B-4EF9-959C-30F559524BC4}"
@@ -37,18 +35,6 @@ Global
3735
{709C54E1-0F2F-4A59-80B2-4CFD08B720E5}.Release|x64.Build.0 = Release|x64
3836
{709C54E1-0F2F-4A59-80B2-4CFD08B720E5}.Release|x86.ActiveCfg = Release|Win32
3937
{709C54E1-0F2F-4A59-80B2-4CFD08B720E5}.Release|x86.Build.0 = Release|Win32
40-
{48847923-880A-4A61-99CF-64B8EABD412B}.Debug|ARM64.ActiveCfg = Debug|ARM64
41-
{48847923-880A-4A61-99CF-64B8EABD412B}.Debug|ARM64.Build.0 = Debug|ARM64
42-
{48847923-880A-4A61-99CF-64B8EABD412B}.Debug|x64.ActiveCfg = Debug|x64
43-
{48847923-880A-4A61-99CF-64B8EABD412B}.Debug|x64.Build.0 = Debug|x64
44-
{48847923-880A-4A61-99CF-64B8EABD412B}.Debug|x86.ActiveCfg = Debug|x86
45-
{48847923-880A-4A61-99CF-64B8EABD412B}.Debug|x86.Build.0 = Debug|x86
46-
{48847923-880A-4A61-99CF-64B8EABD412B}.Release|ARM64.ActiveCfg = Release|ARM64
47-
{48847923-880A-4A61-99CF-64B8EABD412B}.Release|ARM64.Build.0 = Release|ARM64
48-
{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x64.ActiveCfg = Release|x64
49-
{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x64.Build.0 = Release|x64
50-
{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x86.ActiveCfg = Release|x86
51-
{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x86.Build.0 = Release|x86
5238
{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|ARM64.ActiveCfg = Debug|ARM64
5339
{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|ARM64.Build.0 = Debug|ARM64
5440
{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x64.ActiveCfg = Debug|x64
@@ -85,7 +71,6 @@ Global
8571
EndGlobalSection
8672
GlobalSection(NestedProjects) = preSolution
8773
{709C54E1-0F2F-4A59-80B2-4CFD08B720E5} = {1C23C858-0772-4881-A947-32E8870C35AE}
88-
{48847923-880A-4A61-99CF-64B8EABD412B} = {D326EA21-1EE1-4D67-A0CE-898D9EC84300}
8974
{0A343519-113B-4EF9-959C-30F559524BC4} = {D326EA21-1EE1-4D67-A0CE-898D9EC84300}
9075
EndGlobalSection
9176
GlobalSection(ExtensibilityGlobals) = postSolution

0 commit comments

Comments
 (0)