diff options
| author | Jimmy Garrido <jimmygarrido@outlook.com> | 2017-03-06 14:19:36 -0800 |
|---|---|---|
| committer | Samantha Houts <samantha@teamredwall.com> | 2017-03-06 14:19:36 -0800 |
| commit | 65d848051912e1522d692ba647945625f271b23c (patch) | |
| tree | ce20973c7656e2ca170299f9f163ccc430cd7b52 /Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml | |
| parent | 8bc7ba3faade6e7396347f20dd8968fd35491671 (diff) | |
| download | xamarin-forms-65d848051912e1522d692ba647945625f271b23c.tar.gz xamarin-forms-65d848051912e1522d692ba647945625f271b23c.tar.bz2 xamarin-forms-65d848051912e1522d692ba647945625f271b23c.zip | |
[UWP] Improve toolbar consistency on MasterDetailPage (#744)
* Improve toolbar consistency on MasterDetailPage
* Properly indent xaml page
Diffstat (limited to 'Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml')
| -rw-r--r-- | Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml index 3f13f76f..ee51204c 100644 --- a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml @@ -29,26 +29,26 @@ <RowDefinition Height="Auto" /> </Grid.RowDefinitions> - <Border x:Name="TopCommandBarArea" HorizontalAlignment="Stretch" Background="{TemplateBinding ToolbarBackground}"> - <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" MinHeight="{ThemeResource TitleBarHeight}"> - <uwp:FormsCommandBar.Content> - <Border x:Name="TitleArea" Height="{ThemeResource TitleBarHeight}"> - <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Background="{TemplateBinding ToolbarBackground}" > + <Border x:Name="TopCommandBarArea" HorizontalAlignment="Stretch" Background="{TemplateBinding ToolbarBackground}"> + <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" MinHeight="{ThemeResource TitleBarHeight}"> + <uwp:FormsCommandBar.Content> + <Border x:Name="TitleArea" Height="{ThemeResource TitleBarHeight}" Visibility="{TemplateBinding DetailTitleVisibility}"> + <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Background="{TemplateBinding ToolbarBackground}" > - <Button Name="ContentTogglePane" Style="{ThemeResource PaneButton}" Foreground="{TemplateBinding ToolbarForeground}" - Visibility="{TemplateBinding ContentTogglePaneButtonVisibility}" /> + <Button Name="ContentTogglePane" Style="{ThemeResource PaneButton}" Foreground="{TemplateBinding ToolbarForeground}" + Visibility="{TemplateBinding ContentTogglePaneButtonVisibility}" /> - <Border Height="{ThemeResource TitleBarHeight}" Visibility="{TemplateBinding DetailTitleVisibility}"> - <TextBlock Text="{TemplateBinding DetailTitle}" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="{TemplateBinding ToolbarForeground}" Style="{ThemeResource TitleTextBlockStyle}" /> - </Border> + <Border Height="{ThemeResource TitleBarHeight}" Visibility="{TemplateBinding DetailTitleVisibility}"> + <TextBlock Text="{TemplateBinding DetailTitle}" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="{TemplateBinding ToolbarForeground}" Style="{ThemeResource TitleTextBlockStyle}" /> + </Border> - </StackPanel> - </Border> - </uwp:FormsCommandBar.Content> - </uwp:FormsCommandBar> - </Border> + </StackPanel> + </Border> + </uwp:FormsCommandBar.Content> + </uwp:FormsCommandBar> + </Border> - <ContentPresenter x:Name="DetailPresenter" Grid.Row="1" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Detail}" /> + <ContentPresenter x:Name="DetailPresenter" Grid.Row="1" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Detail}" /> <Border x:Name="BottomCommandBarArea" Grid.Row="2" HorizontalAlignment="Stretch"></Border> </Grid> @@ -58,4 +58,4 @@ </Setter.Value> </Setter> </Style> -</ResourceDictionary>
\ No newline at end of file +</ResourceDictionary>
\ No newline at end of file |