Browse Source

Remove NativeMenu.PrependApplicationMenu for now

pull/2978/head
Nikita Tsukanov 7 years ago
parent
commit
dbcc58fa07
  1. 14
      src/Avalonia.Controls/NativeMenu.Export.cs
  2. 1
      src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs
  3. 5
      src/Avalonia.FreeDesktop/DBusMenuExporter.cs
  4. 5
      src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

14
src/Avalonia.Controls/NativeMenu.Export.cs

@ -62,15 +62,6 @@ namespace Avalonia.Controls
public static void SetMenu(AvaloniaObject o, NativeMenu menu) => o.SetValue(MenuProperty, menu);
public static NativeMenu GetMenu(AvaloniaObject o) => o.GetValue(MenuProperty);
public static readonly AttachedProperty<bool> PrependApplicationMenuProperty
= AvaloniaProperty.RegisterAttached<NativeMenu, TopLevel, Boolean>("PrependApplicationMenu");
public static void SetPrependApplicationMenu(TopLevel tl, bool value) =>
tl.SetValue(PrependApplicationMenuProperty, value);
public static bool GetPrependApplicationMenu(TopLevel tl) => tl.GetValue(PrependApplicationMenuProperty);
static NativeMenu()
{
@ -89,11 +80,6 @@ namespace Avalonia.Controls
GetInfo(tl).Exporter?.SetNativeMenu((NativeMenu)args.NewValue);
}
});
PrependApplicationMenuProperty.Changed.Subscribe(args =>
{
GetInfo((TopLevel)args.Sender).Exporter?.SetPrependApplicationMenu((bool)args.NewValue);
});
}
}
}

1
src/Avalonia.Controls/Platform/ITopLevelNativeMenuExporter.cs

@ -9,7 +9,6 @@ namespace Avalonia.Controls.Platform
bool IsNativeMenuExported { get; }
event EventHandler OnIsNativeMenuExportedChanged;
void SetNativeMenu(NativeMenu menu);
void SetPrependApplicationMenu(bool prepend);
}
public interface ITopLevelImplWithNativeMenuExporter : ITopLevelImpl

5
src/Avalonia.FreeDesktop/DBusMenuExporter.cs

@ -161,11 +161,6 @@ namespace Avalonia.FreeDesktop
QueueReset();
}
public void SetPrependApplicationMenu(bool prepend)
{
// Not implemented yet :(
}
public ObjectPath ObjectPath { get; }

5
src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

@ -83,11 +83,6 @@ namespace Avalonia.Native
DoLayoutReset();
}
public void SetPrependApplicationMenu(bool prepend)
{
// OSX always exports the app menu.
}
private void OnItemPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
{
QueueReset();

Loading…
Cancel
Save