Chinese language treatment for WinUI bug.
This commit is contained in:
@@ -9,7 +9,7 @@ using Wino.Helpers;
|
||||
|
||||
namespace Wino.MenuFlyouts;
|
||||
|
||||
public partial class AccountSelectorFlyout : MenuFlyout, IDisposable
|
||||
public partial class AccountSelectorFlyout : WinoMenuFlyout, IDisposable
|
||||
{
|
||||
private readonly IEnumerable<MailAccount> _accounts;
|
||||
private readonly Func<MailAccount, Task> _onItemSelection;
|
||||
|
||||
@@ -9,7 +9,7 @@ using Wino.Helpers;
|
||||
|
||||
namespace Wino.MenuFlyouts;
|
||||
|
||||
public partial class FilterMenuFlyout : MenuFlyout
|
||||
public partial class FilterMenuFlyout : WinoMenuFlyout
|
||||
{
|
||||
public static readonly DependencyProperty SelectedFilterChangedCommandProperty = DependencyProperty.Register(nameof(SelectedFilterChangedCommand), typeof(IRelayCommand<FilterOption>), typeof(FilterMenuFlyout), new PropertyMetadata(null));
|
||||
public static readonly DependencyProperty FilterOptionsProperty = DependencyProperty.Register(nameof(FilterOptions), typeof(List<FilterOption>), typeof(FilterMenuFlyout), new PropertyMetadata(null, new PropertyChangedCallback(OnOptionsChanged)));
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Wino.Core.Domain.Enums;
|
||||
using Wino.Core.Domain.Models.Menus;
|
||||
|
||||
namespace Wino.MenuFlyouts.Context;
|
||||
|
||||
public partial class MailOperationFlyout : WinoOperationFlyout<MailOperationMenuItem>
|
||||
{
|
||||
public MailOperationFlyout(IEnumerable<MailOperationMenuItem> availableActions, TaskCompletionSource<MailOperationMenuItem> completionSource) : base(availableActions, completionSource)
|
||||
{
|
||||
if (AvailableActions == null) return;
|
||||
|
||||
foreach (var action in AvailableActions)
|
||||
{
|
||||
if (action.Operation == MailOperation.Seperator)
|
||||
Items.Add(new MenuFlyoutSeparator());
|
||||
else
|
||||
{
|
||||
var menuFlyoutItem = new MailOperationMenuFlyoutItem(action, (c) => MenuItemClicked(c));
|
||||
|
||||
Items.Add(menuFlyoutItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ using Microsoft.UI.Xaml;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Windows.Foundation;
|
||||
using Wino.Core.Domain.Entities.Mail;
|
||||
using Wino.Mail.WinUI.Controls;
|
||||
|
||||
namespace Wino.MenuFlyouts;
|
||||
|
||||
@@ -13,7 +14,7 @@ public class MoveButtonMenuItemClickedEventArgs
|
||||
public Guid ClickedFolderId { get; set; }
|
||||
}
|
||||
|
||||
public partial class MoveButtonFlyout : MenuFlyout
|
||||
public partial class MoveButtonFlyout : WinoMenuFlyout
|
||||
{
|
||||
public event TypedEventHandler<MoveButtonFlyout, MoveButtonMenuItemClickedEventArgs> MenuItemClick = delegate { };
|
||||
public static readonly DependencyProperty FoldersProperty = DependencyProperty.Register(nameof(Folders), typeof(List<MailItemFolder>), typeof(MoveButtonFlyout), new PropertyMetadata(null, new PropertyChangedCallback(OnFoldersChanged)));
|
||||
@@ -30,8 +31,6 @@ public partial class MoveButtonFlyout : MenuFlyout
|
||||
{
|
||||
menu.InitializeMenu();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void InitializeMenu()
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Wino.Mail.WinUI.Controls;
|
||||
|
||||
namespace Wino.MenuFlyouts;
|
||||
|
||||
public partial class WinoOperationFlyout<TActionType> : MenuFlyout, IDisposable where TActionType : class
|
||||
public partial class WinoOperationFlyout<TActionType> : WinoMenuFlyout, IDisposable where TActionType : class
|
||||
{
|
||||
public TActionType ClickedOperation { get; set; } = null!;
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ using Microsoft.UI.Xaml.Controls;
|
||||
using Wino.Core.Domain.Interfaces;
|
||||
using Wino.Core.Domain.Models.Folders;
|
||||
using Wino.Core.Domain.Models.Menus;
|
||||
using Wino.Mail.WinUI.Controls;
|
||||
using Wino.Helpers;
|
||||
using Wino.Mail.WinUI.Controls;
|
||||
|
||||
namespace Wino.MenuFlyouts;
|
||||
|
||||
@@ -18,6 +18,8 @@ public partial class WinoOperationFlyoutItem<TOperationMenuItem> : MenuFlyoutIte
|
||||
Operation = operationMenuItem;
|
||||
IsEnabled = operationMenuItem.IsEnabled;
|
||||
|
||||
MenuFlyoutLanguageHelper.Apply(this);
|
||||
|
||||
if (Operation is FolderOperationMenuItem folderOperationMenuItem)
|
||||
{
|
||||
var internalOperation = folderOperationMenuItem.Operation;
|
||||
|
||||
Reference in New Issue
Block a user