Improve example flyout

zyj0021 · Mar 31, 2020 · ba3e724 · ba3e724
1 parent 19da839
commit ba3e724
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ModernWpf/Styles/TextStyles.xaml b/ModernWpf/Styles/TextStyles.xaml
@@ -4,34 +4,28 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="BaseTextBlockStyle" TargetType="TextBlock">
-        <!--<Setter Property="FontFamily" Value="XamlAutoFontFamily" />-->
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MessageFontFamilyKey}}" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="TextTrimming" Value="None" />
         <Setter Property="TextWrapping" Value="Wrap" />
         <Setter Property="LineStackingStrategy" Value="MaxHeight" />
-        <!--<Setter Property="TextLineBounds" Value="Full" />-->
     </Style>
     <Style x:Key="HeaderTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="46" />
         <Setter Property="FontWeight" Value="Light" />
-        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
     <Style x:Key="SubheaderTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="34" />
         <Setter Property="FontWeight" Value="Light" />
-        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
     <Style x:Key="TitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontWeight" Value="350" />
         <Setter Property="FontSize" Value="24" />
-        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
     <Style x:Key="SubtitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="FontSize" Value="20" />
-        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
     <Style x:Key="BodyTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontWeight" Value="Normal" />

diff --git a/samples/MahAppsSample/ControlPages/ControlsPage.xaml b/samples/MahAppsSample/ControlPages/ControlsPage.xaml
@@ -20,8 +20,13 @@
                 <Style TargetType="ui:FlyoutPresenter">
                     <Setter Property="Width" Value="296" />
                     <Setter Property="Height" Value="64" />
+                    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+                    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
                 </Style>
             </ui:Flyout.FlyoutPresenterStyle>
+            <TextBlock
+                Text="This is a flyout with placeholder text that wraps to a second line."
+                Style="{StaticResource BodyTextBlockStyle}" />
         </ui:Flyout>
     </Page.Resources>