Skip to content

Commit c1d472e

Browse files
oldnewthingoldnewthing
committed
Windows 10 RTM Release - March 2017 Update 2
1 parent 1d6aec5 commit c1d472e

10 files changed

+96
-191
lines changed

Diff for: ‎Samples/MapControl/shared/Scenario1.xaml

+1-30
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,11 @@
2020
mc:Ignorable="d">
2121

2222
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
23-
<VisualStateManager.VisualStateGroups>
24-
<VisualStateGroup>
25-
<VisualState x:Name="wideState">
26-
<VisualState.StateTriggers>
27-
<AdaptiveTrigger MinWindowWidth="641" />
28-
</VisualState.StateTriggers>
29-
<VisualState.Setters>
30-
<Setter Target="myMap.Height" Value="500"/>
31-
<Setter Target="myMap.Width" Value="500"/>
32-
<Setter Target="description.Margin" Value="0,0,0,0"/>
33-
<Setter Target="StyleStackPanel.Orientation" Value="Horizontal"/>
34-
</VisualState.Setters>
35-
</VisualState>
36-
<VisualState x:Name="narrowState">
37-
<VisualState.StateTriggers>
38-
<AdaptiveTrigger MinWindowWidth="0" />
39-
</VisualState.StateTriggers>
40-
<VisualState.Setters>
41-
<Setter Target="myMap.Height" Value="230"/>
42-
<Setter Target="myMap.Width" Value="280"/>
43-
<Setter Target="description.Margin" Value="28,0,0,0"/>
44-
<Setter Target="StyleStackPanel.Orientation" Value="Vertical"/>
45-
</VisualState.Setters>
46-
</VisualState>
47-
</VisualStateGroup>
48-
</VisualStateManager.VisualStateGroups>
49-
5023
<Grid x:Name="RootGrid" Margin="12,20,12,14">
5124
<Grid.RowDefinitions>
52-
<RowDefinition Height="Auto"/>
53-
<RowDefinition Height="*" />
5425
<RowDefinition Height="Auto"/>
5526
<RowDefinition Height="Auto"/>
27+
<RowDefinition Height="*" />
5628
</Grid.RowDefinitions>
5729
<StackPanel Margin="0,0,0,10" Grid.Row="0">
5830
<TextBlock x:Name="description" Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>
@@ -85,7 +57,6 @@
8557
ZoomLevel="{Binding ElementName=zoomSlider,Path=Value, Mode=TwoWay}"
8658
Heading="{Binding ElementName=headingSlider,Path=Value, Mode=TwoWay}"
8759
DesiredPitch="{Binding ElementName=desiredPitchSlider,Path=Value, Mode=TwoWay}"
88-
HorizontalAlignment="Left"
8960
Loaded="MyMap_Loaded"
9061
MapTapped="MyMap_MapTapped"
9162
/>

Diff for: ‎Samples/MapControl/shared/Scenario2.xaml

+3-26
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,11 @@
2020
mc:Ignorable="d">
2121

2222
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
23-
<VisualStateManager.VisualStateGroups>
24-
<VisualStateGroup>
25-
<VisualState x:Name="wideState">
26-
<VisualState.StateTriggers>
27-
<AdaptiveTrigger MinWindowWidth="641" />
28-
</VisualState.StateTriggers>
29-
<VisualState.Setters>
30-
<Setter Target="myMap.Height" Value="500"/>
31-
<Setter Target="myMap.Width" Value="500"/>
32-
<Setter Target="description.Margin" Value="0,0,0,0"/>
33-
</VisualState.Setters>
34-
</VisualState>
35-
<VisualState x:Name="narrowState">
36-
<VisualState.StateTriggers>
37-
<AdaptiveTrigger MinWindowWidth="0" />
38-
</VisualState.StateTriggers>
39-
<VisualState.Setters>
40-
<Setter Target="myMap.Height" Value="280"/>
41-
<Setter Target="myMap.Width" Value="280"/>
42-
<Setter Target="description.Margin" Value="28,0,0,0"/>
43-
</VisualState.Setters>
44-
</VisualState>
45-
</VisualStateGroup>
46-
</VisualStateManager.VisualStateGroups>
4723
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12,20,12,12">
4824
<Grid.RowDefinitions>
4925
<RowDefinition Height="Auto"/>
50-
<RowDefinition Height="*"/>
5126
<RowDefinition Height="Auto"/>
27+
<RowDefinition Height="*"/>
5228
</Grid.RowDefinitions>
5329
<StackPanel Margin="0,0,0,10">
5430
<TextBlock x:Name="description" Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>
@@ -62,8 +38,9 @@
6238
<Button Content="Add MapIcon to center of Map" x:Name="mapIconAddButton" Click="mapIconAddButton_Click"/>
6339
<Button Content="Add MapPolygon to center of Map" x:Name="mapPolygonAddButton" Click="mapPolygonAddButton_Click"/>
6440
<Button Content="Add MapPolyline to center of Map" x:Name="mapPolylineAddButton" Click="mapPolylineAddButton_Click"/>
65-
<maps:MapControl x:Name="myMap" HorizontalAlignment="Left" TransitFeaturesVisible="False" Loaded="MyMap_Loaded"/>
6641
</StackPanel>
42+
43+
<maps:MapControl x:Name="myMap" TransitFeaturesVisible="False" Loaded="MyMap_Loaded" Grid.Row="2"/>
6744
</Grid>
6845
</Grid>
6946
</Page>

Diff for: ‎Samples/MapControl/shared/Scenario3.xaml

+27-52
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,11 @@
2121
mc:Ignorable="d">
2222

2323
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
24-
<VisualStateManager.VisualStateGroups>
25-
<VisualStateGroup>
26-
<VisualState x:Name="wideState">
27-
<VisualState.StateTriggers>
28-
<AdaptiveTrigger MinWindowWidth="641" />
29-
</VisualState.StateTriggers>
30-
<VisualState.Setters>
31-
<Setter Target="myMap.Height" Value="500"/>
32-
<Setter Target="myMap.Width" Value="500"/>
33-
<Setter Target="description.Margin" Value="0,0,0,0"/>
34-
</VisualState.Setters>
35-
</VisualState>
36-
<VisualState x:Name="narrowState">
37-
<VisualState.StateTriggers>
38-
<AdaptiveTrigger MinWindowWidth="0" />
39-
</VisualState.StateTriggers>
40-
<VisualState.Setters>
41-
<Setter Target="myMap.Height" Value="280"/>
42-
<Setter Target="myMap.Width" Value="280"/>
43-
<Setter Target="description.Margin" Value="28,0,0,0"/>
44-
</VisualState.Setters>
45-
</VisualState>
46-
</VisualStateGroup>
47-
</VisualStateManager.VisualStateGroups>
4824
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12,20,12,12">
4925
<Grid.RowDefinitions>
5026
<RowDefinition Height="Auto"/>
51-
<RowDefinition Height="*"/>
5227
<RowDefinition Height="Auto"/>
28+
<RowDefinition Height="*"/>
5329
</Grid.RowDefinitions>
5430
<StackPanel Margin="0,0,0,10">
5531
<TextBlock x:Name="description" Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>
@@ -58,35 +34,34 @@
5834
</TextBlock>
5935
</StackPanel>
6036

61-
<ScrollViewer Grid.Row="1" VerticalScrollMode="Auto" VerticalScrollBarVisibility="Auto">
62-
<StackPanel>
63-
<Button x:Name="addXamlChildrenButton" Content="Add XAML on MapControl" Click="addXamlChildrenButton_Click"/>
64-
<maps:MapControl x:Name="myMap" HorizontalAlignment="Left" Loaded="MyMap_Loaded">
65-
<maps:MapItemsControl x:Name="MapItems">
66-
<maps:MapItemsControl.ItemTemplate>
67-
<DataTemplate>
68-
<Button x:Name="mapItemButton" Click="mapItemButton_Click" Background="Transparent">
69-
<StackPanel>
70-
<Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
71-
<TextBlock Text="{Binding DisplayName}"/>
72-
</Border>
73-
<Image Source="{Binding ImageSourceUri}"
37+
<StackPanel Grid.Row="1">
38+
<Button x:Name="addXamlChildrenButton" Content="Add XAML on MapControl" Click="addXamlChildrenButton_Click"/>
39+
</StackPanel>
40+
41+
<maps:MapControl x:Name="myMap" Loaded="MyMap_Loaded" Grid.Row="2">
42+
<maps:MapItemsControl x:Name="MapItems">
43+
<maps:MapItemsControl.ItemTemplate>
44+
<DataTemplate>
45+
<Button x:Name="mapItemButton" Click="mapItemButton_Click" Background="Transparent">
46+
<StackPanel>
47+
<Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
48+
<TextBlock Text="{Binding DisplayName}"/>
49+
</Border>
50+
<Image Source="{Binding ImageSourceUri}"
7451
maps:MapControl.NormalizedAnchorPoint="{Binding NormalizedAnchorPoint}"
7552
maps:MapControl.Location="{Binding Location}">
76-
<Image.Transitions>
77-
<TransitionCollection>
78-
<EntranceThemeTransition/>
79-
</TransitionCollection>
80-
</Image.Transitions>
81-
</Image>
82-
</StackPanel>
83-
</Button>
84-
</DataTemplate>
85-
</maps:MapItemsControl.ItemTemplate>
86-
</maps:MapItemsControl>
87-
</maps:MapControl>
88-
</StackPanel>
89-
</ScrollViewer>
53+
<Image.Transitions>
54+
<TransitionCollection>
55+
<EntranceThemeTransition/>
56+
</TransitionCollection>
57+
</Image.Transitions>
58+
</Image>
59+
</StackPanel>
60+
</Button>
61+
</DataTemplate>
62+
</maps:MapItemsControl.ItemTemplate>
63+
</maps:MapItemsControl>
64+
</maps:MapControl>
9065
</Grid>
9166
</Grid>
9267
</Page>

Diff for: ‎Samples/MapControl/shared/Scenario4.xaml

+3-26
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,11 @@
2020
mc:Ignorable="d">
2121

2222
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
23-
<VisualStateManager.VisualStateGroups>
24-
<VisualStateGroup>
25-
<VisualState x:Name="wideState">
26-
<VisualState.StateTriggers>
27-
<AdaptiveTrigger MinWindowWidth="641" />
28-
</VisualState.StateTriggers>
29-
<VisualState.Setters>
30-
<Setter Target="myMap.Height" Value="500"/>
31-
<Setter Target="myMap.Width" Value="500"/>
32-
<Setter Target="description.Margin" Value="0,0,0,0"/>
33-
</VisualState.Setters>
34-
</VisualState>
35-
<VisualState x:Name="narrowState">
36-
<VisualState.StateTriggers>
37-
<AdaptiveTrigger MinWindowWidth="0" />
38-
</VisualState.StateTriggers>
39-
<VisualState.Setters>
40-
<Setter Target="myMap.Height" Value="280"/>
41-
<Setter Target="myMap.Width" Value="280"/>
42-
<Setter Target="description.Margin" Value="28,0,0,0"/>
43-
</VisualState.Setters>
44-
</VisualState>
45-
</VisualStateGroup>
46-
</VisualStateManager.VisualStateGroups>
4723
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12,20,12,12">
4824
<Grid.RowDefinitions>
4925
<RowDefinition Height="Auto"/>
50-
<RowDefinition Height="*"/>
5126
<RowDefinition Height="Auto"/>
27+
<RowDefinition Height="*"/>
5228
</Grid.RowDefinitions>
5329
<StackPanel Margin="0,0,0,10">
5430
<TextBlock x:Name="description" Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>
@@ -59,8 +35,9 @@
5935

6036
<StackPanel Grid.Row="1">
6137
<Button x:Name="showSpaceNeedleButton" Content="Show Space Needle in 3D" Click="showSpaceNeedleButton_Click"/>
62-
<maps:MapControl x:Name="myMap" HorizontalAlignment="Left" Height="500" Width="500" Loaded="myMap_Loaded" />
6338
</StackPanel>
39+
40+
<maps:MapControl x:Name="myMap" Loaded="myMap_Loaded" Grid.Row="2"/>
6441
</Grid>
6542
</Grid>
6643
</Page>

Diff for: ‎Samples/MapControl/shared/Scenario5.xaml

+4-27
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,11 @@
2020
mc:Ignorable="d">
2121

2222
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
23-
<VisualStateManager.VisualStateGroups>
24-
<VisualStateGroup>
25-
<VisualState x:Name="wideState">
26-
<VisualState.StateTriggers>
27-
<AdaptiveTrigger MinWindowWidth="641" />
28-
</VisualState.StateTriggers>
29-
<VisualState.Setters>
30-
<Setter Target="myMap.Height" Value="500"/>
31-
<Setter Target="myMap.Width" Value="500"/>
32-
<Setter Target="description.Margin" Value="0,0,0,0"/>
33-
</VisualState.Setters>
34-
</VisualState>
35-
<VisualState x:Name="narrowState">
36-
<VisualState.StateTriggers>
37-
<AdaptiveTrigger MinWindowWidth="0" />
38-
</VisualState.StateTriggers>
39-
<VisualState.Setters>
40-
<Setter Target="myMap.Height" Value="280"/>
41-
<Setter Target="myMap.Width" Value="280"/>
42-
<Setter Target="description.Margin" Value="28,0,0,0"/>
43-
</VisualState.Setters>
44-
</VisualState>
45-
</VisualStateGroup>
46-
</VisualStateManager.VisualStateGroups>
4723
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12,20,12,12">
4824
<Grid.RowDefinitions>
4925
<RowDefinition Height="Auto"/>
50-
<RowDefinition Height="*"/>
5126
<RowDefinition Height="Auto"/>
27+
<RowDefinition Height="*"/>
5228
</Grid.RowDefinitions>
5329
<StackPanel Margin="0,0,0,10">
5430
<TextBlock x:Name="description" Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>
@@ -57,10 +33,11 @@
5733
</TextBlock>
5834
</StackPanel>
5935

60-
<StackPanel Grid.Row="1">
36+
<StackPanel Grid.Row="1">
6137
<Button x:Name="showStreetSideNearSpaceneedle" Content="Show Streetside near SpaceNeedle" Click="showStreetSideNearSpaceneedle_Click"/>
62-
<maps:MapControl x:Name="myMap" HorizontalAlignment="Left" Height="500" Width="500" Loaded="myMap_Loaded" />
6338
</StackPanel>
39+
40+
<maps:MapControl x:Name="myMap" Loaded="myMap_Loaded" Grid.Row="2"/>
6441
</Grid>
6542
</Grid>
6643
</Page>

Diff for: ‎Samples/MapControl/shared/Scenario6.xaml

-25
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,10 @@
1919
mc:Ignorable="d">
2020

2121
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
22-
<VisualStateManager.VisualStateGroups>
23-
<VisualStateGroup>
24-
<VisualState x:Name="wideState">
25-
<VisualState.StateTriggers>
26-
<AdaptiveTrigger MinWindowWidth="641" />
27-
</VisualState.StateTriggers>
28-
<VisualState.Setters>
29-
<Setter Target="myMap.Height" Value="500"/>
30-
<Setter Target="myMap.Width" Value="500"/>
31-
<Setter Target="description.Margin" Value="0,0,0,0"/>
32-
</VisualState.Setters>
33-
</VisualState>
34-
<VisualState x:Name="narrowState">
35-
<VisualState.StateTriggers>
36-
<AdaptiveTrigger MinWindowWidth="0" />
37-
</VisualState.StateTriggers>
38-
<VisualState.Setters>
39-
<Setter Target="myMap.Height" Value="280"/>
40-
<Setter Target="myMap.Width" Value="280"/>
41-
<Setter Target="description.Margin" Value="28,0,0,0"/>
42-
</VisualState.Setters>
43-
</VisualState>
44-
</VisualStateGroup>
45-
</VisualStateManager.VisualStateGroups>
4622
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12,20,12,12">
4723
<Grid.RowDefinitions>
4824
<RowDefinition Height="Auto"/>
4925
<RowDefinition Height="*"/>
50-
<RowDefinition Height="Auto"/>
5126
</Grid.RowDefinitions>
5227
<StackPanel Margin="0,0,0,10">
5328
<TextBlock x:Name="description" Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>

Diff for: ‎Samples/PosPrinter/cpp/Scenario1_ReceiptPrinter.xaml.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ ReceiptPrintJob^ Scenario1_ReceiptPrinter::GetMerchantFooter(ClaimedPosPrinter ^
227227
merchantFooter->PrintLine("Signature");
228228
merchantFooter->PrintLine();
229229
merchantFooter->PrintLine("Merchant Copy");
230-
merchantFooter->CutPaper();
230+
LineFeedAndCutPaper(merchantFooter);
231231

232232
return merchantFooter;
233233
}
@@ -240,11 +240,28 @@ ReceiptPrintJob^ Scenario1_ReceiptPrinter::GetCustomerFooter(ClaimedPosPrinter ^
240240
customerFooter->PrintLine("Tip");
241241
customerFooter->PrintLine();
242242
customerFooter->PrintLine("Customer Copy");
243-
customerFooter->CutPaper();
243+
LineFeedAndCutPaper(customerFooter);
244244

245245
return customerFooter;
246246
}
247247

248+
// Cut the paper after printing enough blank lines to clear the paper cutter.
249+
void Scenario1_ReceiptPrinter::LineFeedAndCutPaper(ReceiptPrintJob^ job)
250+
{
251+
if (printer != nullptr && claimedPrinter != nullptr)
252+
{
253+
for (unsigned int n = 0; n < claimedPrinter->Receipt->LinesToPaperCut; n++)
254+
{
255+
job->PrintLine();
256+
}
257+
258+
if (printer->Capabilities->Receipt->CanCutPaper)
259+
{
260+
job->CutPaper();
261+
}
262+
}
263+
}
264+
248265
//
249266
//PosPrinter GetDeviceSelector gets the string format used to search for pos printer. This is then used to find any pos printers.
250267
//The method then takes the first printer id found and tries to create an instance of that printer.

Diff for: ‎Samples/PosPrinter/cpp/Scenario1_ReceiptPrinter.xaml.h

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ namespace SDKTemplate
5151
void ResetTheScenarioState();
5252
ReceiptPrintJob^ GetMerchantFooter(ClaimedPosPrinter^ claimedInstance);
5353
ReceiptPrintJob^ GetCustomerFooter(ClaimedPosPrinter^ claimedInstance);
54+
void LineFeedAndCutPaper(ReceiptPrintJob^ job);
5455

5556
task<void> ClaimPrinter();
5657
task<void> EnableAsync();

0 commit comments

Comments
 (0)