diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2016-12-01 22:39:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-01 22:39:43 +0100 |
commit | 1ff0db9c6f4ba1167e6b2620066f83088f23c5bf (patch) | |
tree | dbab7e305046c6ee4b1ccafd60afd3e255385320 /Xamarin.Forms.Platform.UAP | |
parent | e413e0cf331ae1512e2d8a6fcc89446c1cf2225c (diff) | |
download | xamarin-forms-1ff0db9c6f4ba1167e6b2620066f83088f23c5bf.tar.gz xamarin-forms-1ff0db9c6f4ba1167e6b2620066f83088f23c5bf.tar.bz2 xamarin-forms-1ff0db9c6f4ba1167e6b2620066f83088f23c5bf.zip |
Jimmgarrido uwp toolbar (#588)
* Fixed CommandBar being clipped when expanded by removing explicit Height
* Add UITest
Diffstat (limited to 'Xamarin.Forms.Platform.UAP')
-rw-r--r-- | Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml | 5 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.UAP/PageControlStyle.xaml | 5 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml index d82f78af..cd3a4401 100644 --- a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml @@ -3,7 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style TargetType="uwp:MasterDetailControl"> - <Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> + <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> + <Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="uwp:MasterDetailControl"> @@ -47,7 +48,7 @@ </StackPanel> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> + <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" /> </Border> </Grid> diff --git a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml b/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml index bd199487..e1137a7c 100644 --- a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml @@ -4,7 +4,8 @@ xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style TargetType="uwp:PageControl"> <Setter Property="ContentMargin" Value="0" /> - <Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> + <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> + <Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="uwp:PageControl"> @@ -27,7 +28,7 @@ </Border> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> + <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" /> </Border> </Grid> diff --git a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml b/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml index 6d54a073..de6bcf1e 100644 --- a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml @@ -3,7 +3,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style x:Key="TabbedPageStyle" TargetType="uwp:FormsPivot"> - <Setter Property="HeaderTemplate"> + <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> + + <Setter Property="HeaderTemplate"> <Setter.Value> <DataTemplate> <TextBlock Name="TabbedPageHeaderTextBlock" Text="{Binding Title}" Style="{ThemeResource BodyTextBlockStyle}" /> @@ -75,7 +77,7 @@ </Border> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> + <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" /> </Border> </Grid> |