Skip to content

Commit

Permalink
Merge pull request #12113 from Youssef1313/menubar-breaking-changes
Browse files Browse the repository at this point in the history
fix!: Move MenuBar to MUX namespace
  • Loading branch information
Youssef1313 authored May 16, 2023
2 parents 84c67ac + b9faac0 commit 3056a4b
Show file tree
Hide file tree
Showing 33 changed files with 434 additions and 202 deletions.
3 changes: 3 additions & 0 deletions build/PackageDiffIgnore.xml
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@
<Member fullName="Windows.Foundation.SizeConverter" reason="Api alignments" />
<Member fullName="Windows.UI.Xaml.ResourceHelper" reason="Api alignments" />
<Member fullName="Uno.UI.Extensions.CollectionViewExtensions" reason="Api alignments" />
<Member fullName="Windows.UI.Xaml.Controls.NativeMenuBarPresenter" reason="Api alignments" />
<Member fullName="Windows.UI.Xaml.Controls.AnimatedVisualPlayer" reason="Api alignments" />
<Member fullName="Windows.UI.Xaml.Controls.IAnimatedVisualSource" reason="Api alignments" />
<Member fullName="Windows.UI.Xaml.Controls.IThemableAnimatedVisualSource" reason="Api alignments" />
Expand Down Expand Up @@ -1007,6 +1008,8 @@

<Member fullName="System.Void Windows.ApplicationModel.SuspendingDeferral..ctor(System.Action deferralDone)" reason="This constructor does not exist in Windows" />
<Member fullName="Windows.UI.Xaml.Controls.PersonPictureTemplateSettings Windows.UI.Xaml.Controls.PersonPicture.get_TemplateSettings()" reason="Moved to MUXC" />
<Member fullName="System.Boolean Windows.UI.Xaml.Controls.MenuBarItem.IsFlyoutOpen()" reason="Api alignments" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.MenuBarItem.Invoke()" reason="Api alignments" />
<Member fullName="System.Boolean Windows.UI.Xaml.Controls.RelativePanel.GetAlignBottomWithPanel(Windows.UI.Xaml.UIElement view)" reason="Api alignments" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.RelativePanel.SetAlignBottomWithPanel(Windows.UI.Xaml.UIElement view, System.Boolean value)" reason="Api alignments" />
<Member fullName="System.Boolean Windows.UI.Xaml.Controls.RelativePanel.GetAlignLeftWithPanel(Windows.UI.Xaml.UIElement view)" reason="Api alignments" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:local="using:UITests.Shared.Windows_UI_Xaml_Controls.MenuBarTests"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400">
Expand All @@ -14,8 +15,8 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<MenuBar>
<MenuBarItem x:Name="fileMenu" Title="File">
<muxc:MenuBar>
<muxc:MenuBarItem x:Name="fileMenu" Title="File">
<MenuFlyoutSubItem x:Name="newMenu" Text="New">
<MenuFlyoutItem x:Name="plainTextMenu" Text="Plain Text Document"
Command="{x:Bind MyCommand}" CommandParameter="Plain Text" />
Expand Down Expand Up @@ -50,9 +51,9 @@
Text="Exit"
Click="MenuFlyoutItem_Click"
AccessKey="X" />
</MenuBarItem>
</muxc:MenuBarItem>

<MenuBarItem x:Name="editMenu" Title="Edit">
<muxc:MenuBarItem x:Name="editMenu" Title="Edit">
<MenuFlyoutItem Text="Undo"
Click="MenuFlyoutItem_Click"/>
<MenuFlyoutItem Text="Cut"
Expand All @@ -65,13 +66,13 @@
Click="MenuFlyoutItem_Click" />
<ToggleMenuFlyoutItem x:Name="ShuffleToggleMenuFlyoutItem" Text="Shuffle" IsChecked="False"
Click="MenuFlyoutItem_Click" />
</MenuBarItem>
</muxc:MenuBarItem>

<MenuBarItem x:Name="helpMenu" Title="Help">
<muxc:MenuBarItem x:Name="helpMenu" Title="Help">
<MenuFlyoutItem Text="About"
Click="MenuFlyoutItem_Click"/>
</MenuBarItem>
</MenuBar>
</muxc:MenuBarItem>
</muxc:MenuBar>
<StackPanel Grid.Row="1">
<TextBlock x:Name="result" />
</StackPanel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class Given_FrameworkElement_And_Leak
[DataRow(typeof(Slider), 15)]
[DataRow(typeof(SymbolIcon), 15)]
[DataRow(typeof(Viewbox), 15)]
[DataRow(typeof(Windows.UI.Xaml.Controls.MenuBar), 15)]
[DataRow(typeof(Microsoft.UI.Xaml.Controls.MenuBar), 15)]
[DataRow(typeof(ComboBox), 15)]
[DataRow(typeof(Canvas), 15)]
[DataRow(typeof(AutoSuggestBox), 15)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes;

using MenuBar = Microsoft.UI.Xaml.Controls.MenuBar;
using MenuBarItem = Microsoft.UI.Xaml.Controls.MenuBarItem;

namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
{
[TestClass]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
using Windows.UI.Xaml.Media.Imaging;
using Windows.UI.Xaml.Shapes;
using static Private.Infrastructure.TestServices;
#if NETFX_CORE
// Use the MUX MenuBar on Window for consistency, since Uno is using the MUX styles. (However Uno.UI only defines WUXC.MenuBar, not MUXC.MenuBar)

using MenuBar = Microsoft.UI.Xaml.Controls.MenuBar;
using MenuBarItem = Microsoft.UI.Xaml.Controls.MenuBarItem;
using MenuBarItemAutomationPeer = Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer;
#endif

namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
{
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.UI.Tests/Windows_UI_Xaml/Given_Implicit_Style.cs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public void Verify_Framework_DefaultStyleKeys()
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.CommandBar>();
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.AppBarButton>();
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.Frame>();
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.MenuBarItem>(isString: true);
AssertDefaultStyleKey<Microsoft.UI.Xaml.Controls.MenuBarItem>(isString: true);
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.MenuFlyoutPresenter>();
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.MenuFlyoutItem>();
AssertDefaultStyleKey<Windows.UI.Xaml.Controls.MenuFlyoutSubItem>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,18 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Automation.Peers
{
// Skipped type, see SkippedType method
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented]
#endif
public partial class MenuBarAutomationPeer : global::Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer
{
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public MenuBarAutomationPeer( global::Microsoft.UI.Xaml.Controls.MenuBar owner) : base(owner)
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Xaml.Automation.Peers.MenuBarAutomationPeer", "MenuBarAutomationPeer.MenuBarAutomationPeer(MenuBar owner)");
}
#endif
// Forced skipping of method Microsoft.UI.Xaml.Automation.Peers.MenuBarAutomationPeer.MenuBarAutomationPeer(Microsoft.UI.Xaml.Controls.MenuBar)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,28 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Automation.Peers
{
// Skipped type, see SkippedType method
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class MenuBarItemAutomationPeer : global::Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer,global::Windows.UI.Xaml.Automation.Provider.IExpandCollapseProvider,global::Windows.UI.Xaml.Automation.Provider.IInvokeProvider
{
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::Windows.UI.Xaml.Automation.ExpandCollapseState ExpandCollapseState
{
get
{
throw new global::System.NotImplementedException("The member ExpandCollapseState MenuBarItemAutomationPeer.ExpandCollapseState is not implemented. For more information, visit https://aka.platform.uno/notimplemented?m=ExpandCollapseState%20MenuBarItemAutomationPeer.ExpandCollapseState");
}
}
#endif
// Skipping already declared method Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.MenuBarItemAutomationPeer(Microsoft.UI.Xaml.Controls.MenuBarItem)
// Forced skipping of method Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.MenuBarItemAutomationPeer(Microsoft.UI.Xaml.Controls.MenuBarItem)
// Forced skipping of method Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.ExpandCollapseState.get
// Skipping already declared method Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.Collapse()
// Skipping already declared method Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.Expand()
// Skipping already declared method Microsoft.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.Invoke()
// Processing: Windows.UI.Xaml.Automation.Provider.IExpandCollapseProvider
// Processing: Windows.UI.Xaml.Automation.Provider.IInvokeProvider
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,16 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Controls
{
// Skipped type, see SkippedType method
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class MenuBar : global::Windows.UI.Xaml.Controls.Control
{
// Skipping already declared property Items
// Skipping already declared property ItemsProperty
// Skipping already declared method Microsoft.UI.Xaml.Controls.MenuBar.MenuBar()
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBar.MenuBar()
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBar.Items.get
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBar.ItemsProperty.get
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,21 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Controls
{
// Skipped type, see SkippedType method
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class MenuBarItem : global::Windows.UI.Xaml.Controls.Control
{
// Skipping already declared property Title
// Skipping already declared property Items
// Skipping already declared property ItemsProperty
// Skipping already declared property TitleProperty
// Skipping already declared method Microsoft.UI.Xaml.Controls.MenuBarItem.MenuBarItem()
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItem.MenuBarItem()
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItem.Title.get
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItem.Title.set
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItem.Items.get
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItem.TitleProperty.get
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItem.ItemsProperty.get
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,12 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Controls
{
// Skipped type, see SkippedType method
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class MenuBarItemFlyout : global::Windows.UI.Xaml.Controls.MenuFlyout
{
// Skipping already declared method Microsoft.UI.Xaml.Controls.MenuBarItemFlyout.MenuBarItemFlyout()
// Forced skipping of method Microsoft.UI.Xaml.Controls.MenuBarItemFlyout.MenuBarItemFlyout()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#pragma warning disable 114 // new keyword hiding
namespace Windows.UI.Xaml.Automation.Peers
{
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class MenuBarAutomationPeer : global::Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,36 @@ public partial class MenuBarItemAutomationPeer : global::Windows.UI.Xaml.Automa
}
}
#endif
// Skipping already declared method Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.MenuBarItemAutomationPeer(Windows.UI.Xaml.Controls.MenuBarItem)
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public MenuBarItemAutomationPeer( global::Windows.UI.Xaml.Controls.MenuBarItem owner) : base(owner)
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer", "MenuBarItemAutomationPeer.MenuBarItemAutomationPeer(MenuBarItem owner)");
}
#endif
// Forced skipping of method Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.MenuBarItemAutomationPeer(Windows.UI.Xaml.Controls.MenuBarItem)
// Forced skipping of method Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.ExpandCollapseState.get
// Skipping already declared method Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.Collapse()
// Skipping already declared method Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.Expand()
// Skipping already declared method Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer.Invoke()
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public void Collapse()
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer", "void MenuBarItemAutomationPeer.Collapse()");
}
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public void Expand()
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer", "void MenuBarItemAutomationPeer.Expand()");
}
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public void Invoke()
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Xaml.Automation.Peers.MenuBarItemAutomationPeer", "void MenuBarItemAutomationPeer.Invoke()");
}
#endif
// Processing: Windows.UI.Xaml.Automation.Provider.IExpandCollapseProvider
// Processing: Windows.UI.Xaml.Automation.Provider.IInvokeProvider
}
Expand Down
20 changes: 18 additions & 2 deletions src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/MenuBar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,24 @@ namespace Windows.UI.Xaml.Controls
#endif
public partial class MenuBar : global::Windows.UI.Xaml.Controls.Control
{
// Skipping already declared property Items
// Skipping already declared property ItemsProperty
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuBarItem> Items
{
get
{
return (global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuBarItem>)this.GetValue(ItemsProperty);
}
}
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Windows.UI.Xaml.DependencyProperty ItemsProperty { get; } =
Windows.UI.Xaml.DependencyProperty.Register(
nameof(Items), typeof(global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuBarItem>),
typeof(global::Windows.UI.Xaml.Controls.MenuBar),
new Windows.UI.Xaml.FrameworkPropertyMetadata(default(global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuBarItem>)));
#endif
// Skipping already declared method Windows.UI.Xaml.Controls.MenuBar.MenuBar()
// Forced skipping of method Windows.UI.Xaml.Controls.MenuBar.MenuBar()
// Forced skipping of method Windows.UI.Xaml.Controls.MenuBar.Items.get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,46 @@ namespace Windows.UI.Xaml.Controls
#endif
public partial class MenuBarItem : global::Windows.UI.Xaml.Controls.Control
{
// Skipping already declared property Title
// Skipping already declared property Items
// Skipping already declared property ItemsProperty
// Skipping already declared property TitleProperty
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public string Title
{
get
{
return (string)this.GetValue(TitleProperty);
}
set
{
this.SetValue(TitleProperty, value);
}
}
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuFlyoutItemBase> Items
{
get
{
return (global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuFlyoutItemBase>)this.GetValue(ItemsProperty);
}
}
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Windows.UI.Xaml.DependencyProperty ItemsProperty { get; } =
Windows.UI.Xaml.DependencyProperty.Register(
nameof(Items), typeof(global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuFlyoutItemBase>),
typeof(global::Windows.UI.Xaml.Controls.MenuBarItem),
new Windows.UI.Xaml.FrameworkPropertyMetadata(default(global::System.Collections.Generic.IList<global::Windows.UI.Xaml.Controls.MenuFlyoutItemBase>)));
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Windows.UI.Xaml.DependencyProperty TitleProperty { get; } =
Windows.UI.Xaml.DependencyProperty.Register(
nameof(Title), typeof(string),
typeof(global::Windows.UI.Xaml.Controls.MenuBarItem),
new Windows.UI.Xaml.FrameworkPropertyMetadata(default(string)));
#endif
// Skipping already declared method Windows.UI.Xaml.Controls.MenuBarItem.MenuBarItem()
// Forced skipping of method Windows.UI.Xaml.Controls.MenuBarItem.MenuBarItem()
// Forced skipping of method Windows.UI.Xaml.Controls.MenuBarItem.Title.get
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Microsoft.UI.Xaml.Controls;

internal enum FlyoutLocation
{
Left,
Right
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma warning disable 108 // new keyword hiding
#pragma warning disable 114 // new keyword hiding
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Markup;

namespace Windows.UI.Xaml.Controls
namespace Microsoft.UI.Xaml.Controls
{
[ContentProperty(Name = nameof(Items))]
public partial class MenuBar : Control
Expand All @@ -19,12 +19,12 @@ public IList<MenuBarItem> Items
private set => this.SetValue(ItemsProperty, value);
}

public static global::Windows.UI.Xaml.DependencyProperty ItemsProperty { get; } =
Windows.UI.Xaml.DependencyProperty.Register(
"Items",
typeof(global::System.Collections.Generic.IList<MenuBarItem>),
typeof(MenuBar),
new FrameworkPropertyMetadata(null)
public static DependencyProperty ItemsProperty { get; } =
DependencyProperty.Register(
"Items",
typeof(IList<MenuBarItem>),
typeof(MenuBar),
new FrameworkPropertyMetadata(null)
);

public MenuBar() : base()
Expand Down
Loading

0 comments on commit 3056a4b

Please sign in to comment.