diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2016-12-01 22:54:14 +0100 |
---|---|---|
committer | Stephane Delcroix <stephane@delcroix.org> | 2016-12-01 22:54:14 +0100 |
commit | 84f42e5b14156eac3773d914df2e1514fb76f51b (patch) | |
tree | 13561dc4a0de125359927a19d0e244515442d5c8 | |
parent | 3ff3487d4fa5edb7ba3dcd7b6db0e6b58b03809c (diff) | |
download | xamarin-forms-84f42e5b14156eac3773d914df2e1514fb76f51b.tar.gz xamarin-forms-84f42e5b14156eac3773d914df2e1514fb76f51b.tar.bz2 xamarin-forms-84f42e5b14156eac3773d914df2e1514fb76f51b.zip |
Revert "Jimmgarrido uwp toolbar (#588)"
This reverts commit 1ff0db9c6f4ba1167e6b2620066f83088f23c5bf.
5 files changed, 7 insertions, 51 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47295.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47295.cs deleted file mode 100644 index 0277e7d4..00000000 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47295.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Xamarin.Forms.CustomAttributes; -using Xamarin.Forms.Internals; - -#if UITEST -using Xamarin.UITest; -using NUnit.Framework; -#endif - -namespace Xamarin.Forms.Controls.Issues -{ - [Preserve(AllMembers = true)] - [Issue(IssueTracker.Bugzilla, 47295, "Toolbar in a NavigationPage is clipped when expanded", PlatformAffected.WinRT)] - public class Bugzilla47295 : TestNavigationPage - { - protected override void Init() - { - PushAsync(new TestPage47295()); - } - } - - [Preserve(AllMembers = true)] - public class TestPage47295 : ContentPage - { - public TestPage47295() - { - var descLabel = new Label { Text = "Press '...' to expand the CommandBar. The ToolbarItem's text label should not be clipped." }; - var pressedLabel = new Label { Text = "ToolbarItem pressed.", IsVisible = false }; - Content = new StackLayout - { - Children = { - descLabel, - pressedLabel - } - }; - - ToolbarItems.Add(new ToolbarItem("Test", "toolbar_close", () => pressedLabel.IsVisible = true)); - } - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems index 625226db..08c26ba1 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems @@ -140,7 +140,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44476.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla46630.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla47971.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Bugzilla47295.cs" /> <Compile Include="$(MSBuildThisFileDirectory)CarouselAsync.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla34561.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Bugzilla34727.cs" /> @@ -606,4 +605,4 @@ <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml index cd3a4401..d82f78af 100644 --- a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml @@ -3,8 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style TargetType="uwp:MasterDetailControl"> - <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> - <Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> + <Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="uwp:MasterDetailControl"> @@ -48,7 +47,7 @@ </StackPanel> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" /> + <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> </Border> </Grid> diff --git a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml b/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml index e1137a7c..bd199487 100644 --- a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml @@ -4,8 +4,7 @@ xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style TargetType="uwp:PageControl"> <Setter Property="ContentMargin" Value="0" /> - <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> - <Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> + <Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="uwp:PageControl"> @@ -28,7 +27,7 @@ </Border> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" /> + <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> </Border> </Grid> diff --git a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml b/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml index de6bcf1e..6d54a073 100644 --- a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml @@ -3,9 +3,7 @@ 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="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> - - <Setter Property="HeaderTemplate"> + <Setter Property="HeaderTemplate"> <Setter.Value> <DataTemplate> <TextBlock Name="TabbedPageHeaderTextBlock" Text="{Binding Title}" Style="{ThemeResource BodyTextBlockStyle}" /> @@ -77,7 +75,7 @@ </Border> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" /> + <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> </Border> </Grid> |