Browse Source
* Updated the TrayIcon in IntegrationTestApp to have an associated menu. Updated App.axaml.cs to set the DataContext for binding and provide a command implementation. Added a project reference to Avalonia.ReactiveUI. * Updated CanExecuteChanged in NativeMenuItem.cs to thunk to the UI thread if it ends up running on a non-UI thread. * Replace ReactiveUI with MiniMvvm to simplify integration tests app --------- Co-authored-by: Max Katz <maxkatz6@outlook.com>pull/16159/head
committed by
GitHub
4 changed files with 37 additions and 8 deletions
@ -1,13 +1,21 @@ |
|||||
<Application xmlns="https://github.com/avaloniaui" |
<Application xmlns="https://github.com/avaloniaui" |
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
||||
x:Class="IntegrationTestApp.App"> |
xmlns:self="using:IntegrationTestApp" |
||||
|
x:Class="IntegrationTestApp.App" |
||||
|
x:DataType="self:App" |
||||
|
RequestedThemeVariant="Default"> |
||||
<Application.Styles> |
<Application.Styles> |
||||
<FluentTheme /> |
<FluentTheme /> |
||||
</Application.Styles> |
</Application.Styles> |
||||
<TrayIcon.Icons> |
<TrayIcon.Icons> |
||||
<TrayIcons> |
<TrayIcons> |
||||
<TrayIcon Icon="/Assets/icon.ico"> |
<TrayIcon Icon="/Assets/icon.ico"> |
||||
</TrayIcon> |
<TrayIcon.Menu> |
||||
</TrayIcons> |
<NativeMenu> |
||||
</TrayIcon.Icons> |
<NativeMenuItem Header="Show _Test Window" Command="{Binding ShowWindowCommand}" /> |
||||
|
</NativeMenu> |
||||
|
</TrayIcon.Menu> |
||||
|
</TrayIcon> |
||||
|
</TrayIcons> |
||||
|
</TrayIcon.Icons> |
||||
</Application> |
</Application> |
||||
|
|||||
Loading…
Reference in new issue