Skip to content

Commit 260700b

Browse files
committed
Turn everyone on for testing
1 parent 3a516e6 commit 260700b

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

Samples/Islands/WpfCalculator/CalculatorDemo/App.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// // Copyright (c) Microsoft. All rights reserved.
22
// // Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

4-
#if false // Demo3_Step1_AddWasdk
4+
#if true // Demo3_Step1_AddWasdk
55
using Microsoft.UI.Dispatching;
66
#endif
77
using System.Windows;
@@ -13,7 +13,7 @@ namespace CalculatorDemo
1313
/// </summary>
1414
public partial class App : Application
1515
{
16-
#if false // Demo3_Step1_AddWasdk
16+
#if true // Demo3_Step1_AddWasdk
1717
// Many WinAppSDK APIs require a DispatcherQueue to be running on the thread. We'll start one when the app starts up
1818
// and shut it down when the app is finished.
1919
protected override void OnStartup(StartupEventArgs e)

Samples/Islands/WpfCalculator/CalculatorDemo/CalculatorDemo.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@
113113
<DependentUpon>Settings.settings</DependentUpon>
114114
<DesignTimeSharedInput>True</DesignTimeSharedInput>
115115
</Compile>
116-
<!-- Demo4_Step2_AddIsland
116+
<!-- Demo4_Step2_AddIsland -->
117117
<Compile Include="WpfIslandHost.cs" />
118-
-->
118+
<!-- -->
119119
<EmbeddedResource Include="Properties\Resources.resx">
120120
<Generator>ResXFileCodeGenerator</Generator>
121121
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -130,16 +130,16 @@
130130
<None Include="App.config" />
131131
</ItemGroup>
132132
<ItemGroup>
133-
<!-- Demo3_Step1_AddWasdk
133+
<!-- Demo3_Step1_AddWasdk -->
134134
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
135135
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
136-
-->
136+
<!-- -->
137137
</ItemGroup>
138-
<!-- Demo4_Step2_AddIsland
138+
<!-- Demo4_Step2_AddIsland -->
139139
<ItemGroup>
140140
<ProjectReference Include="..\DrawingIslandCsProjection\DrawingIslandCsProjection.csproj" />
141141
</ItemGroup>
142-
-->
142+
<!-- -->
143143
<ItemGroup>
144144
<Resource Include="appicon.ico" />
145145
</ItemGroup>

Samples/Islands/WpfCalculator/CalculatorDemo/MainWindow.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Windows.Input;
99
using System.Windows.Interop;
1010
using Windows.ApplicationModel.Contacts;
11-
#if false // Demo3_Step2_AddCompact
11+
#if true // Demo3_Step2_AddCompact
1212
using Microsoft.UI;
1313
using Microsoft.UI.Windowing;
1414
#endif
@@ -24,11 +24,11 @@ public sealed partial class MainWindow : Window
2424
private Operation _lastOper;
2525
private string _lastVal;
2626
private string _memVal;
27-
#if false // Demo3_Step2_AddCompact
27+
#if true // Demo3_Step2_AddCompact
2828
private AppWindow _appWindow;
2929
#endif
3030

31-
#if false // Demo4_Step2_AddIsland
31+
#if true // Demo4_Step2_AddIsland
3232
private Microsoft.UI.Composition.Compositor _compositor = new Microsoft.UI.Composition.Compositor();
3333
#endif
3434
public MainWindow()
@@ -457,7 +457,7 @@ public void Clear()
457457
}
458458
}
459459

460-
#if false // Demo3_Step2_AddCompact
460+
#if true // Demo3_Step2_AddCompact
461461
private void CompactView_Click(object sender, RoutedEventArgs e)
462462
{
463463
SetCompactView(true);
@@ -498,7 +498,7 @@ void SetCompactView(bool useCompactView)
498498
}
499499
#endif
500500

501-
#if false // Demo4_Step2_AddIsland
501+
#if true // Demo4_Step2_AddIsland
502502
private void CreateDrawingIslandMenuItem_Click(object sender, RoutedEventArgs e)
503503
{
504504
var wpfIslandHost = new WpfIslandHost(_compositor);

Samples/Islands/WpfCalculator/CalculatorDemo/MainWindow.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
<DockPanel Name="MyPanel">
2727
<Menu Name="MainMenu" DockPanel.Dock="Top">
2828
<MenuItem Header="File">
29-
<!-- Demo4_Step2_AddIsland
29+
<!-- Demo4_Step2_AddIsland -->
3030
<MenuItem Name="CreateDrawingIslandMenuItem" Click="CreateDrawingIslandMenuItem_Click" Header="Create DrawingIsland" />
31-
-->
31+
<!-- -->
3232
<MenuItem Click="OnMenuExit" Header="Exit" />
3333
</MenuItem>
3434
<MenuItem Header="View">
3535
<MenuItem Name="StandardMenu" Click="OnMenuStandard" IsCheckable="true" IsChecked="True"
3636
Header="Standard" />
37-
<!-- Demo3_Step2_AddCompact
37+
<!-- Demo3_Step2_AddCompact -->
3838
<MenuItem Name="CompactView" Click="CompactView_Click" Header="Enter Compact View" />
39-
-->
39+
<!-- -->
4040
</MenuItem>
4141
<MenuItem Header="Help">
4242
<MenuItem Click="OnMenuAbout" Header="About" />
@@ -127,7 +127,7 @@
127127
</DockPanel>
128128

129129
<!-- This is what's shown when we enter the compat view mode-->
130-
<!-- Demo3_Step2_AddCompact
130+
<!-- Demo3_Step2_AddCompact -->
131131
<DockPanel Name="CompactPanel" Visibility="Collapsed">
132132
<DockPanel DockPanel.Dock="Top">
133133
<Button Name="ExitCompactViewButton" Click="ExitCompactViewButton_Click" DockPanel.Dock="Right">Restore</Button>
@@ -137,6 +137,6 @@
137137
<Border x:Name="CompactAreaBorder">
138138
</Border>
139139
</DockPanel>
140-
-->
140+
<!-- -->
141141
</Grid>
142142
</Window>

0 commit comments

Comments
 (0)