From 84f42e5b14156eac3773d914df2e1514fb76f51b Mon Sep 17 00:00:00 2001 From: Stephane Delcroix Date: Thu, 1 Dec 2016 22:54:14 +0100 Subject: [PATCH] Revert "Jimmgarrido uwp toolbar (#588)" This reverts commit 1ff0db9c6f4ba1167e6b2620066f83088f23c5bf. --- .../Bugzilla47295.cs | 39 ------------------- ...rin.Forms.Controls.Issues.Shared.projitems | 3 +- .../MasterDetailControlStyle.xaml | 5 +-- .../PageControlStyle.xaml | 5 +-- .../TabbedPageStyle.xaml | 6 +-- 5 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47295.cs 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 0277e7d47..000000000 --- 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 625226db9..08c26ba14 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 @@ - @@ -606,4 +605,4 @@ MSBuild:UpdateDesignTimeXaml - + \ No newline at end of file diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml index cd3a44014..d82f78af5 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">