Skip to content

Commit

Permalink
Windows 10 Version 1709 - January 2019 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@oldnewthing
oldnewthing committed Jan 10, 2019
1 parent 4a34dbd commit da59ad2
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
8 changes: 4 additions & 4 deletions Samples/DWriteLineSpacingModes/cpp/DWriteLineSpacingModes/Scenario1_DefaultSpacing.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,19 @@ present in the font." />
<TextBlock Margin="0,0,0,4" Text="Metrics of first line (DWRITE_LINE_METRICS1 members):" TextWrapping="WrapWholeWords" />
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="height:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutHeight, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutHeight}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="baseline:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutBaseline, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutBaseline}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="leadingBefore:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingBefore, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingBefore}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="leadingAfter:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingAfter, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingAfter}" />
</StackPanel>
</StackPanel>

Expand Down
6 changes: 3 additions & 3 deletions Samples/DWriteLineSpacingModes/cpp/DWriteLineSpacingModes/Scenario1_DefaultSpacing.xaml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Scenario1_DefaultSpacing::Scenario1_DefaultSpacing()
L"en-US",
L"Cambria Math",
24.0f, // text size (DIPs)
static_cast<uint32>(floor(TextLayoutImage->ActualWidth)), // text layout width
static_cast<uint32>(floor(TextLayoutImage->Width)), // text layout width
LineSpacingMethod::Default
);

Expand All @@ -53,8 +53,8 @@ Scenario1_DefaultSpacing::Scenario1_DefaultSpacing()
// it draw, and then use it as the source for the XAML image element.
m_textLayoutImageSource = ref new TextLayoutImageSource(
m_textLayout,
static_cast<uint32>(floor(TextLayoutImage->ActualWidth)),
static_cast<uint32>(floor(TextLayoutImage->ActualHeight))
static_cast<uint32>(floor(TextLayoutImage->Width)),
static_cast<uint32>(floor(TextLayoutImage->Height))
);
m_textLayoutImageSource->Draw();
TextLayoutImage->Source = m_textLayoutImageSource;
Expand Down
12 changes: 6 additions & 6 deletions Samples/DWriteLineSpacingModes/cpp/DWriteLineSpacingModes/Scenario2_UniformSpacing.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@ the line with the emoji has the same spacing as all the other lines." />
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Height:" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0,0,4,0"/>
<TextBlock Text="{x:Bind Path=LineSpacingHeight, Mode=OneWay}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
<TextBlock Text="{x:Bind Path=LineSpacingHeight}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
</StackPanel>
<Slider Minimum="0" Maximum="100" StepFrequency="0.1" Width="Auto"
Value="{x:Bind Path=LineSpacingHeight, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Baseline:" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0,0,4,0"/>
<TextBlock Text="{x:Bind Path=LineSpacingBaseline, Mode=OneWay}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
<TextBlock Text="{x:Bind Path=LineSpacingBaseline}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
</StackPanel>
<Slider Minimum="0" Maximum="100" StepFrequency="0.1"
Value="{x:Bind Path=LineSpacingBaseline, Mode=TwoWay}" />
Expand All @@ -196,19 +196,19 @@ the line with the emoji has the same spacing as all the other lines." />
<TextBlock Margin="0,0,0,4" Text="Metrics of first line (DWRITE_LINE_METRICS1 members):" TextWrapping="WrapWholeWords" />
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="height:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutHeight, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutHeight}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="baseline:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutBaseline, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutBaseline}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="leadingBefore:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingBefore, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingBefore}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="leadingAfter:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingAfter, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingAfter}" />
</StackPanel>
</StackPanel>

Expand Down
6 changes: 3 additions & 3 deletions Samples/DWriteLineSpacingModes/cpp/DWriteLineSpacingModes/Scenario2_UniformSpacing.xaml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Scenario2_UniformSpacing::Scenario2_UniformSpacing()
L"en-US",
L"Cambria Math",
24.0f, // text size (DIPs)
static_cast<uint32>(floor(TextLayoutImage->ActualWidth)), // text layout width
static_cast<uint32>(floor(TextLayoutImage->Width)), // text layout width
LineSpacingMethod::Uniform
);

Expand All @@ -53,8 +53,8 @@ Scenario2_UniformSpacing::Scenario2_UniformSpacing()
// it draw, and then use it as the source for the XAML image element.
m_textLayoutImageSource = ref new TextLayoutImageSource(
m_textLayout,
static_cast<uint32>(floor(TextLayoutImage->ActualWidth)),
static_cast<uint32>(floor(TextLayoutImage->ActualHeight))
static_cast<uint32>(floor(TextLayoutImage->Width)),
static_cast<uint32>(floor(TextLayoutImage->Height))
);
m_textLayoutImageSource->Draw();
TextLayoutImage->Source = m_textLayoutImageSource;
Expand Down
14 changes: 7 additions & 7 deletions Samples/DWriteLineSpacingModes/cpp/DWriteLineSpacingModes/Scenario3_ProportionalSpacing.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,23 +230,23 @@ The only way to ensure the same spacing on all lines is to use uniform spacing."
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Height:" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0,0,4,0"/>
<TextBlock Text="{x:Bind Path=LineSpacingHeight, Mode=OneWay}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
<TextBlock Text="{x:Bind Path=LineSpacingHeight}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
</StackPanel>
<Slider Name="HeightSlider" Minimum="0" Maximum="4" StepFrequency="0.01"
Value="{x:Bind Path=LineSpacingHeight, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Baseline:" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0,0,4,0"/>
<TextBlock Text="{x:Bind Path=LineSpacingBaseline, Mode=OneWay}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
<TextBlock Text="{x:Bind Path=LineSpacingBaseline}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
</StackPanel>
<Slider Name="BaselineSlider" Minimum="0" Maximum="4" StepFrequency="0.01"
Value="{x:Bind Path=LineSpacingBaseline, Mode=TwoWay}" />
</StackPanel>
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Leading before:" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0,0,4,0"/>
<TextBlock Text="{x:Bind Path=LineSpacingLeadingBefore, Mode=OneWay}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
<TextBlock Text="{x:Bind Path=LineSpacingLeadingBefore}" FontSize="{ThemeResource ControlContentThemeFontSize}" Margin="0" />
</StackPanel>
<Slider Name="LeadingBeforeSlider" Minimum="0" Maximum="1" StepFrequency="0.01"
Value="{x:Bind Path=LineSpacingLeadingBefore, Mode=TwoWay}" />
Expand All @@ -266,19 +266,19 @@ The only way to ensure the same spacing on all lines is to use uniform spacing."
<TextBlock Margin="0,0,0,4" Text="Computed metrics of first line (DWRITE_LINE_METRICS1 members):" TextWrapping="WrapWholeWords" />
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="height:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutHeight, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutHeight}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="baseline:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutBaseline, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutBaseline}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="leadingBefore:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingBefore, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingBefore}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
<TextBlock Margin="0,0,4,0" Text="leadingAfter:" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingAfter, Mode=OneWay}" />
<TextBlock Margin="0" Text="{x:Bind Path=TextLayoutLeadingAfter}" />
</StackPanel>
</StackPanel>

Expand Down
6 changes: 3 additions & 3 deletions .../DWriteLineSpacingModes/cpp/DWriteLineSpacingModes/Scenario3_ProportionalSpacing.xaml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Scenario3_ProportionalSpacing::Scenario3_ProportionalSpacing()
L"en-US",
L"Cambria Math",
24.0f, // text size (DIPs)
static_cast<uint32>(floor(TextLayoutImage->ActualWidth)), // text layout width
static_cast<uint32>(floor(TextLayoutImage->Width)), // text layout width
LineSpacingMethod::Proportional
);

Expand All @@ -53,8 +53,8 @@ Scenario3_ProportionalSpacing::Scenario3_ProportionalSpacing()
// it draw, and then use it as the source for the XAML image element.
m_textLayoutImageSource = ref new TextLayoutImageSource(
m_textLayout,
static_cast<uint32>(floor(TextLayoutImage->ActualWidth)),
static_cast<uint32>(floor(TextLayoutImage->ActualHeight))
static_cast<uint32>(floor(TextLayoutImage->Width)),
static_cast<uint32>(floor(TextLayoutImage->Height))
);
m_textLayoutImageSource->Draw();
TextLayoutImage->Source = m_textLayoutImageSource;
Expand Down
14 changes: 7 additions & 7 deletions ...mpleCommunication/common/MediaExtensions/Microsoft.Samples.SimpleCommunication/StspDefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ struct StspDescription

enum StspSampleFlags
{
StspSampleFlag_BottomFieldFirst,
StspSampleFlag_CleanPoint,
StspSampleFlag_DerivedFromTopField,
StspSampleFlag_Discontinuity,
StspSampleFlag_Interlaced,
StspSampleFlag_RepeatFirstField,
StspSampleFlag_SingleField,
StspSampleFlag_BottomFieldFirst = 1,
StspSampleFlag_CleanPoint = 2,
StspSampleFlag_DerivedFromTopField = 4,
StspSampleFlag_Discontinuity = 8,
StspSampleFlag_Interlaced = 16,
StspSampleFlag_RepeatFirstField = 32,
StspSampleFlag_SingleField = 64,
};

struct StspSampleHeader
Expand Down

0 comments on commit da59ad2

Please sign in to comment.