Steven Kirk
4 years ago
152 changed files with 4186 additions and 297 deletions
@ -0,0 +1,33 @@ |
|||
//
|
|||
// trayicon.h
|
|||
// Avalonia.Native.OSX
|
|||
//
|
|||
// Created by Dan Walmsley on 09/09/2021.
|
|||
// Copyright © 2021 Avalonia. All rights reserved.
|
|||
//
|
|||
|
|||
#ifndef trayicon_h |
|||
#define trayicon_h |
|||
|
|||
#include "common.h" |
|||
|
|||
class AvnTrayIcon : public ComSingleObject<IAvnTrayIcon, &IID_IAvnTrayIcon> |
|||
{ |
|||
private: |
|||
NSStatusItem* _native; |
|||
|
|||
public: |
|||
FORWARD_IUNKNOWN() |
|||
|
|||
AvnTrayIcon(); |
|||
|
|||
~AvnTrayIcon (); |
|||
|
|||
virtual HRESULT SetIcon (void* data, size_t length) override; |
|||
|
|||
virtual HRESULT SetMenu (IAvnMenu* menu) override; |
|||
|
|||
virtual HRESULT SetIsVisible (bool isVisible) override; |
|||
}; |
|||
|
|||
#endif /* trayicon_h */ |
|||
@ -0,0 +1,85 @@ |
|||
#include "common.h" |
|||
#include "trayicon.h" |
|||
#include "menu.h" |
|||
|
|||
extern IAvnTrayIcon* CreateTrayIcon() |
|||
{ |
|||
@autoreleasepool |
|||
{ |
|||
return new AvnTrayIcon(); |
|||
} |
|||
} |
|||
|
|||
AvnTrayIcon::AvnTrayIcon() |
|||
{ |
|||
_native = [[NSStatusBar systemStatusBar] statusItemWithLength: NSSquareStatusItemLength]; |
|||
|
|||
} |
|||
|
|||
AvnTrayIcon::~AvnTrayIcon() |
|||
{ |
|||
if(_native != nullptr) |
|||
{ |
|||
[[_native statusBar] removeStatusItem:_native]; |
|||
_native = nullptr; |
|||
} |
|||
} |
|||
|
|||
HRESULT AvnTrayIcon::SetIcon (void* data, size_t length) |
|||
{ |
|||
START_COM_CALL; |
|||
|
|||
@autoreleasepool |
|||
{ |
|||
if(data != nullptr) |
|||
{ |
|||
NSData *imageData = [NSData dataWithBytes:data length:length]; |
|||
NSImage *image = [[NSImage alloc] initWithData:imageData]; |
|||
|
|||
NSSize originalSize = [image size]; |
|||
|
|||
NSSize size; |
|||
size.height = [[NSFont menuFontOfSize:0] pointSize] * 1.333333; |
|||
|
|||
auto scaleFactor = size.height / originalSize.height; |
|||
size.width = originalSize.width * scaleFactor; |
|||
|
|||
[image setSize: size]; |
|||
[_native setImage:image]; |
|||
} |
|||
else |
|||
{ |
|||
[_native setImage:nullptr]; |
|||
} |
|||
return S_OK; |
|||
} |
|||
} |
|||
|
|||
HRESULT AvnTrayIcon::SetMenu (IAvnMenu* menu) |
|||
{ |
|||
START_COM_CALL; |
|||
|
|||
@autoreleasepool |
|||
{ |
|||
auto appMenu = dynamic_cast<AvnAppMenu*>(menu); |
|||
|
|||
if(appMenu != nullptr) |
|||
{ |
|||
[_native setMenu:appMenu->GetNative()]; |
|||
} |
|||
} |
|||
|
|||
return S_OK; |
|||
} |
|||
|
|||
HRESULT AvnTrayIcon::SetIsVisible(bool isVisible) |
|||
{ |
|||
START_COM_CALL; |
|||
|
|||
@autoreleasepool |
|||
{ |
|||
[_native setVisible:isVisible]; |
|||
} |
|||
|
|||
return S_OK; |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
using Avalonia; |
|||
using Avalonia.Controls.ApplicationLifetimes; |
|||
using MiniMvvm; |
|||
|
|||
namespace ControlCatalog.ViewModels |
|||
{ |
|||
public class ApplicationViewModel : ViewModelBase |
|||
{ |
|||
public ApplicationViewModel() |
|||
{ |
|||
ExitCommand = MiniCommand.Create(() => |
|||
{ |
|||
if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime) |
|||
{ |
|||
lifetime.Shutdown(); |
|||
} |
|||
}); |
|||
|
|||
ToggleCommand = MiniCommand.Create(() => { }); |
|||
} |
|||
|
|||
public MiniCommand ExitCommand { get; } |
|||
|
|||
public MiniCommand ToggleCommand { get; } |
|||
} |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
#nullable enable |
|||
using System; |
|||
|
|||
namespace Avalonia.LogicalTree |
|||
{ |
|||
/// <summary>
|
|||
/// Event args for <see cref="IChildIndexProvider.ChildIndexChanged"/> event.
|
|||
/// </summary>
|
|||
public class ChildIndexChangedEventArgs : EventArgs |
|||
{ |
|||
public ChildIndexChangedEventArgs() |
|||
{ |
|||
} |
|||
|
|||
public ChildIndexChangedEventArgs(ILogical child) |
|||
{ |
|||
Child = child; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Logical child which index was changed.
|
|||
/// If null, all children should be reset.
|
|||
/// </summary>
|
|||
public ILogical? Child { get; } |
|||
} |
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
#nullable enable |
|||
using System; |
|||
|
|||
namespace Avalonia.LogicalTree |
|||
{ |
|||
/// <summary>
|
|||
/// Child's index and total count information provider used by list-controls (ListBox, StackPanel, etc.)
|
|||
/// </summary>
|
|||
/// <remarks>
|
|||
/// Used by nth-child and nth-last-child selectors.
|
|||
/// </remarks>
|
|||
public interface IChildIndexProvider |
|||
{ |
|||
/// <summary>
|
|||
/// Gets child's actual index in order of the original source.
|
|||
/// </summary>
|
|||
/// <param name="child">Logical child.</param>
|
|||
/// <returns>Index or -1 if child was not found.</returns>
|
|||
int GetChildIndex(ILogical child); |
|||
|
|||
/// <summary>
|
|||
/// Total children count or null if source is infinite.
|
|||
/// Some Avalonia features might not work if <see cref="TryGetTotalCount"/> returns false, for instance: nth-last-child selector.
|
|||
/// </summary>
|
|||
bool TryGetTotalCount(out int count); |
|||
|
|||
/// <summary>
|
|||
/// Notifies subscriber when child's index or total count was changed.
|
|||
/// </summary>
|
|||
event EventHandler<ChildIndexChangedEventArgs>? ChildIndexChanged; |
|||
} |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
#nullable enable |
|||
using Avalonia.LogicalTree; |
|||
|
|||
namespace Avalonia.Styling.Activators |
|||
{ |
|||
/// <summary>
|
|||
/// An <see cref="IStyleActivator"/> which is active when control's index was changed.
|
|||
/// </summary>
|
|||
internal sealed class NthChildActivator : StyleActivatorBase |
|||
{ |
|||
private readonly ILogical _control; |
|||
private readonly IChildIndexProvider _provider; |
|||
private readonly int _step; |
|||
private readonly int _offset; |
|||
private readonly bool _reversed; |
|||
|
|||
public NthChildActivator( |
|||
ILogical control, |
|||
IChildIndexProvider provider, |
|||
int step, int offset, bool reversed) |
|||
{ |
|||
_control = control; |
|||
_provider = provider; |
|||
_step = step; |
|||
_offset = offset; |
|||
_reversed = reversed; |
|||
} |
|||
|
|||
protected override void Initialize() |
|||
{ |
|||
PublishNext(IsMatching()); |
|||
_provider.ChildIndexChanged += ChildIndexChanged; |
|||
} |
|||
|
|||
protected override void Deinitialize() |
|||
{ |
|||
_provider.ChildIndexChanged -= ChildIndexChanged; |
|||
} |
|||
|
|||
private void ChildIndexChanged(object sender, ChildIndexChangedEventArgs e) |
|||
{ |
|||
// Run matching again if:
|
|||
// 1. Selector is reversed, so other item insertion/deletion might affect total count without changing subscribed item index.
|
|||
// 2. e.Child is null, when all children indeces were changed.
|
|||
// 3. Subscribed child index was changed.
|
|||
if (_reversed |
|||
|| e.Child is null |
|||
|| e.Child == _control) |
|||
{ |
|||
PublishNext(IsMatching()); |
|||
} |
|||
} |
|||
|
|||
private bool IsMatching() => NthChildSelector.Evaluate(_control, _provider, _step, _offset, _reversed).IsMatch; |
|||
} |
|||
} |
|||
@ -0,0 +1,145 @@ |
|||
#nullable enable |
|||
using System; |
|||
using System.Text; |
|||
using Avalonia.LogicalTree; |
|||
using Avalonia.Styling.Activators; |
|||
|
|||
namespace Avalonia.Styling |
|||
{ |
|||
/// <summary>
|
|||
/// The :nth-child() pseudo-class matches elements based on their position in a group of siblings.
|
|||
/// </summary>
|
|||
/// <remarks>
|
|||
/// Element indices are 1-based.
|
|||
/// </remarks>
|
|||
public class NthChildSelector : Selector |
|||
{ |
|||
private const string NthChildSelectorName = "nth-child"; |
|||
private const string NthLastChildSelectorName = "nth-last-child"; |
|||
private readonly Selector? _previous; |
|||
private readonly bool _reversed; |
|||
|
|||
internal protected NthChildSelector(Selector? previous, int step, int offset, bool reversed) |
|||
{ |
|||
_previous = previous; |
|||
Step = step; |
|||
Offset = offset; |
|||
_reversed = reversed; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Creates an instance of <see cref="NthChildSelector"/>
|
|||
/// </summary>
|
|||
/// <param name="previous">Previous selector.</param>
|
|||
/// <param name="step">Position step.</param>
|
|||
/// <param name="offset">Initial index offset.</param>
|
|||
public NthChildSelector(Selector? previous, int step, int offset) |
|||
: this(previous, step, offset, false) |
|||
{ |
|||
|
|||
} |
|||
|
|||
public override bool InTemplate => _previous?.InTemplate ?? false; |
|||
|
|||
public override bool IsCombinator => false; |
|||
|
|||
public override Type? TargetType => _previous?.TargetType; |
|||
|
|||
public int Step { get; } |
|||
public int Offset { get; } |
|||
|
|||
protected override SelectorMatch Evaluate(IStyleable control, bool subscribe) |
|||
{ |
|||
if (!(control is ILogical logical)) |
|||
{ |
|||
return SelectorMatch.NeverThisType; |
|||
} |
|||
|
|||
var controlParent = logical.LogicalParent; |
|||
|
|||
if (controlParent is IChildIndexProvider childIndexProvider) |
|||
{ |
|||
return subscribe |
|||
? new SelectorMatch(new NthChildActivator(logical, childIndexProvider, Step, Offset, _reversed)) |
|||
: Evaluate(logical, childIndexProvider, Step, Offset, _reversed); |
|||
} |
|||
else |
|||
{ |
|||
return SelectorMatch.NeverThisInstance; |
|||
} |
|||
} |
|||
|
|||
internal static SelectorMatch Evaluate( |
|||
ILogical logical, IChildIndexProvider childIndexProvider, |
|||
int step, int offset, bool reversed) |
|||
{ |
|||
var index = childIndexProvider.GetChildIndex(logical); |
|||
if (index < 0) |
|||
{ |
|||
return SelectorMatch.NeverThisInstance; |
|||
} |
|||
|
|||
if (reversed) |
|||
{ |
|||
if (childIndexProvider.TryGetTotalCount(out var totalCountValue)) |
|||
{ |
|||
index = totalCountValue - index; |
|||
} |
|||
else |
|||
{ |
|||
return SelectorMatch.NeverThisInstance; |
|||
} |
|||
} |
|||
else |
|||
{ |
|||
// nth child index is 1-based
|
|||
index += 1; |
|||
} |
|||
|
|||
var n = Math.Sign(step); |
|||
|
|||
var diff = index - offset; |
|||
var match = diff == 0 || (Math.Sign(diff) == n && diff % step == 0); |
|||
|
|||
return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance; |
|||
} |
|||
|
|||
protected override Selector? MovePrevious() => _previous; |
|||
|
|||
public override string ToString() |
|||
{ |
|||
var expectedCapacity = NthLastChildSelectorName.Length + 8; |
|||
var stringBuilder = new StringBuilder(_previous?.ToString(), expectedCapacity); |
|||
|
|||
stringBuilder.Append(':'); |
|||
stringBuilder.Append(_reversed ? NthLastChildSelectorName : NthChildSelectorName); |
|||
stringBuilder.Append('('); |
|||
|
|||
var hasStep = false; |
|||
if (Step != 0) |
|||
{ |
|||
hasStep = true; |
|||
stringBuilder.Append(Step); |
|||
stringBuilder.Append('n'); |
|||
} |
|||
|
|||
if (Offset > 0) |
|||
{ |
|||
if (hasStep) |
|||
{ |
|||
stringBuilder.Append('+'); |
|||
} |
|||
stringBuilder.Append(Offset); |
|||
} |
|||
else if (Offset < 0) |
|||
{ |
|||
stringBuilder.Append('-'); |
|||
stringBuilder.Append(-Offset); |
|||
} |
|||
|
|||
stringBuilder.Append(')'); |
|||
|
|||
return stringBuilder.ToString(); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
#nullable enable |
|||
|
|||
namespace Avalonia.Styling |
|||
{ |
|||
/// <summary>
|
|||
/// The :nth-child() pseudo-class matches elements based on their position among a group of siblings, counting from the end.
|
|||
/// </summary>
|
|||
/// <remarks>
|
|||
/// Element indices are 1-based.
|
|||
/// </remarks>
|
|||
public class NthLastChildSelector : NthChildSelector |
|||
{ |
|||
/// <summary>
|
|||
/// Creates an instance of <see cref="NthLastChildSelector"/>
|
|||
/// </summary>
|
|||
/// <param name="previous">Previous selector.</param>
|
|||
/// <param name="step">Position step.</param>
|
|||
/// <param name="offset">Initial index offset, counting from the end.</param>
|
|||
public NthLastChildSelector(Selector? previous, int step, int offset) : base(previous, step, offset, true) |
|||
{ |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
using System; |
|||
using Avalonia.Controls.Platform; |
|||
|
|||
#nullable enable |
|||
|
|||
namespace Avalonia.Platform |
|||
{ |
|||
public interface ITrayIconImpl : IDisposable |
|||
{ |
|||
/// <summary>
|
|||
/// Sets the icon of this tray icon.
|
|||
/// </summary>
|
|||
void SetIcon(IWindowIconImpl? icon); |
|||
|
|||
/// <summary>
|
|||
/// Sets the icon of this tray icon.
|
|||
/// </summary>
|
|||
void SetToolTipText(string? text); |
|||
|
|||
/// <summary>
|
|||
/// Sets if the tray icon is visible or not.
|
|||
/// </summary>
|
|||
void SetIsVisible(bool visible); |
|||
|
|||
/// <summary>
|
|||
/// Gets the MenuExporter to allow native menus to be exported to the TrayIcon.
|
|||
/// </summary>
|
|||
INativeMenuExporter? MenuExporter { get; } |
|||
|
|||
/// <summary>
|
|||
/// Gets or Sets the Action that is called when the TrayIcon is clicked.
|
|||
/// </summary>
|
|||
Action? OnClicked { get; set; } |
|||
} |
|||
} |
|||
@ -1,8 +1,13 @@ |
|||
#nullable enable |
|||
|
|||
namespace Avalonia.Platform |
|||
{ |
|||
public interface IWindowingPlatform |
|||
{ |
|||
IWindowImpl CreateWindow(); |
|||
|
|||
IWindowImpl CreateEmbeddableWindow(); |
|||
|
|||
ITrayIconImpl? CreateTrayIcon(); |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,20 @@ |
|||
namespace Avalonia.Controls.Templates |
|||
{ |
|||
public class TemplateResult<T> |
|||
{ |
|||
public T Result { get; } |
|||
public INameScope NameScope { get; } |
|||
|
|||
public TemplateResult(T result, INameScope nameScope) |
|||
{ |
|||
Result = result; |
|||
NameScope = nameScope; |
|||
} |
|||
|
|||
public void Deconstruct(out T result, out INameScope scope) |
|||
{ |
|||
result = Result; |
|||
scope = NameScope; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,234 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Windows.Input; |
|||
using Avalonia.Collections; |
|||
using Avalonia.Controls.ApplicationLifetimes; |
|||
using Avalonia.Controls.Platform; |
|||
using Avalonia.Platform; |
|||
using Avalonia.Utilities; |
|||
|
|||
#nullable enable |
|||
|
|||
namespace Avalonia.Controls |
|||
{ |
|||
public sealed class TrayIcons : AvaloniaList<TrayIcon> |
|||
{ |
|||
} |
|||
|
|||
|
|||
|
|||
public class TrayIcon : AvaloniaObject, INativeMenuExporterProvider, IDisposable |
|||
{ |
|||
private readonly ITrayIconImpl? _impl; |
|||
private ICommand? _command; |
|||
|
|||
private TrayIcon(ITrayIconImpl? impl) |
|||
{ |
|||
if (impl != null) |
|||
{ |
|||
_impl = impl; |
|||
|
|||
_impl.SetIsVisible(IsVisible); |
|||
|
|||
_impl.OnClicked = () => |
|||
{ |
|||
Clicked?.Invoke(this, EventArgs.Empty); |
|||
|
|||
if (Command?.CanExecute(CommandParameter) == true) |
|||
{ |
|||
Command.Execute(CommandParameter); |
|||
} |
|||
}; |
|||
} |
|||
} |
|||
|
|||
public TrayIcon() : this(PlatformManager.CreateTrayIcon()) |
|||
{ |
|||
} |
|||
|
|||
static TrayIcon() |
|||
{ |
|||
IconsProperty.Changed.Subscribe(args => |
|||
{ |
|||
if (args.Sender is Application) |
|||
{ |
|||
if (args.OldValue.Value != null) |
|||
{ |
|||
RemoveIcons(args.OldValue.Value); |
|||
} |
|||
|
|||
if (args.NewValue.Value != null) |
|||
{ |
|||
args.NewValue.Value.CollectionChanged += Icons_CollectionChanged; |
|||
} |
|||
} |
|||
}); |
|||
|
|||
if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime) |
|||
{ |
|||
lifetime.Exit += Lifetime_Exit; |
|||
} |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Raised when the TrayIcon is clicked.
|
|||
/// Note, this is only supported on Win32 and some Linux DEs,
|
|||
/// on OSX this event is not raised.
|
|||
/// </summary>
|
|||
public event EventHandler? Clicked; |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="Command"/> property.
|
|||
/// </summary>
|
|||
public static readonly DirectProperty<TrayIcon, ICommand?> CommandProperty = |
|||
Button.CommandProperty.AddOwner<TrayIcon>( |
|||
trayIcon => trayIcon.Command, |
|||
(trayIcon, command) => trayIcon.Command = command, |
|||
enableDataValidation: true); |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="CommandParameter"/> property.
|
|||
/// </summary>
|
|||
public static readonly StyledProperty<object?> CommandParameterProperty = |
|||
Button.CommandParameterProperty.AddOwner<MenuItem>(); |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="TrayIcons"/> attached property.
|
|||
/// </summary>
|
|||
public static readonly AttachedProperty<TrayIcons> IconsProperty |
|||
= AvaloniaProperty.RegisterAttached<TrayIcon, Application, TrayIcons>("Icons"); |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="Menu"/> property.
|
|||
/// </summary>
|
|||
public static readonly StyledProperty<NativeMenu?> MenuProperty |
|||
= AvaloniaProperty.Register<TrayIcon, NativeMenu?>(nameof(Menu)); |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="Icon"/> property.
|
|||
/// </summary>
|
|||
public static readonly StyledProperty<WindowIcon> IconProperty = |
|||
Window.IconProperty.AddOwner<TrayIcon>(); |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="ToolTipText"/> property.
|
|||
/// </summary>
|
|||
public static readonly StyledProperty<string?> ToolTipTextProperty = |
|||
AvaloniaProperty.Register<TrayIcon, string?>(nameof(ToolTipText)); |
|||
|
|||
/// <summary>
|
|||
/// Defines the <see cref="IsVisible"/> property.
|
|||
/// </summary>
|
|||
public static readonly StyledProperty<bool> IsVisibleProperty = |
|||
Visual.IsVisibleProperty.AddOwner<TrayIcon>(); |
|||
|
|||
public static void SetIcons(AvaloniaObject o, TrayIcons trayIcons) => o.SetValue(IconsProperty, trayIcons); |
|||
|
|||
public static TrayIcons GetIcons(AvaloniaObject o) => o.GetValue(IconsProperty); |
|||
|
|||
/// <summary>
|
|||
/// Gets or sets the <see cref="Command"/> property of a TrayIcon.
|
|||
/// </summary>
|
|||
public ICommand? Command |
|||
{ |
|||
get => _command; |
|||
set => SetAndRaise(CommandProperty, ref _command, value); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Gets or sets the parameter to pass to the <see cref="Command"/> property of a
|
|||
/// <see cref="TrayIcon"/>.
|
|||
/// </summary>
|
|||
public object CommandParameter |
|||
{ |
|||
get { return GetValue(CommandParameterProperty); } |
|||
set { SetValue(CommandParameterProperty, value); } |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Gets or sets the Menu of the TrayIcon.
|
|||
/// </summary>
|
|||
public NativeMenu? Menu |
|||
{ |
|||
get => GetValue(MenuProperty); |
|||
set => SetValue(MenuProperty, value); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Gets or sets the icon of the TrayIcon.
|
|||
/// </summary>
|
|||
public WindowIcon Icon |
|||
{ |
|||
get => GetValue(IconProperty); |
|||
set => SetValue(IconProperty, value); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Gets or sets the tooltip text of the TrayIcon.
|
|||
/// </summary>
|
|||
public string? ToolTipText |
|||
{ |
|||
get => GetValue(ToolTipTextProperty); |
|||
set => SetValue(ToolTipTextProperty, value); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Gets or sets the visibility of the TrayIcon.
|
|||
/// </summary>
|
|||
public bool IsVisible |
|||
{ |
|||
get => GetValue(IsVisibleProperty); |
|||
set => SetValue(IsVisibleProperty, value); |
|||
} |
|||
|
|||
public INativeMenuExporter? NativeMenuExporter => _impl?.MenuExporter; |
|||
|
|||
private static void Lifetime_Exit(object sender, ControlledApplicationLifetimeExitEventArgs e) |
|||
{ |
|||
var trayIcons = GetIcons(Application.Current); |
|||
|
|||
RemoveIcons(trayIcons); |
|||
} |
|||
|
|||
private static void Icons_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) |
|||
{ |
|||
RemoveIcons(e.OldItems.Cast<TrayIcon>()); |
|||
} |
|||
|
|||
private static void RemoveIcons(IEnumerable<TrayIcon> icons) |
|||
{ |
|||
foreach (var icon in icons) |
|||
{ |
|||
icon.Dispose(); |
|||
} |
|||
} |
|||
|
|||
protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change) |
|||
{ |
|||
base.OnPropertyChanged(change); |
|||
|
|||
if (change.Property == IconProperty) |
|||
{ |
|||
_impl?.SetIcon(Icon.PlatformImpl); |
|||
} |
|||
else if (change.Property == IsVisibleProperty) |
|||
{ |
|||
_impl?.SetIsVisible(change.NewValue.GetValueOrDefault<bool>()); |
|||
} |
|||
else if (change.Property == ToolTipTextProperty) |
|||
{ |
|||
_impl?.SetToolTipText(change.NewValue.GetValueOrDefault<string?>()); |
|||
} |
|||
else if (change.Property == MenuProperty) |
|||
{ |
|||
_impl?.MenuExporter?.SetNativeMenu(change.NewValue.GetValueOrDefault<NativeMenu>()); |
|||
} |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Disposes the tray icon (removing it from the tray area).
|
|||
/// </summary>
|
|||
public void Dispose() => _impl?.Dispose(); |
|||
} |
|||
} |
|||
@ -0,0 +1,457 @@ |
|||
#nullable enable |
|||
|
|||
using System; |
|||
using System.Diagnostics; |
|||
using System.Reactive.Disposables; |
|||
using System.Runtime.CompilerServices; |
|||
using System.Threading.Tasks; |
|||
using Avalonia.Controls.Platform; |
|||
using Avalonia.Logging; |
|||
using Avalonia.Platform; |
|||
using Tmds.DBus; |
|||
|
|||
[assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)] |
|||
|
|||
[assembly: |
|||
InternalsVisibleTo( |
|||
"Avalonia.X11, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")] |
|||
|
|||
namespace Avalonia.FreeDesktop |
|||
{ |
|||
internal class DBusTrayIconImpl : ITrayIconImpl |
|||
{ |
|||
private static int s_trayIconInstanceId; |
|||
|
|||
private readonly ObjectPath _dbusMenuPath; |
|||
private readonly Connection? _connection; |
|||
private IDisposable? _serviceWatchDisposable; |
|||
|
|||
private StatusNotifierItemDbusObj? _statusNotifierItemDbusObj; |
|||
private IStatusNotifierWatcher? _statusNotifierWatcher; |
|||
private DbusPixmap _icon; |
|||
|
|||
private string? _sysTrayServiceName; |
|||
private string? _tooltipText; |
|||
private bool _isDisposed; |
|||
private bool _serviceConnected; |
|||
private bool _isVisible = true; |
|||
|
|||
public bool IsActive { get; private set; } |
|||
public INativeMenuExporter? MenuExporter { get; } |
|||
public Action? OnClicked { get; set; } |
|||
public Func<IWindowIconImpl?, uint[]>? IconConverterDelegate { get; set; } |
|||
|
|||
public DBusTrayIconImpl() |
|||
{ |
|||
_connection = DBusHelper.TryCreateNewConnection(); |
|||
|
|||
if (_connection is null) |
|||
{ |
|||
Logger.TryGet(LogEventLevel.Error, "DBUS") |
|||
?.Log(this, "Unable to get a dbus connection for system tray icons."); |
|||
|
|||
return; |
|||
} |
|||
|
|||
IsActive = true; |
|||
|
|||
_dbusMenuPath = DBusMenuExporter.GenerateDBusMenuObjPath; |
|||
|
|||
MenuExporter = DBusMenuExporter.TryCreateDetachedNativeMenu(_dbusMenuPath, _connection); |
|||
|
|||
WatchAsync(); |
|||
} |
|||
|
|||
private void InitializeSNWService() |
|||
{ |
|||
if (_connection is null || _isDisposed) return; |
|||
|
|||
try |
|||
{ |
|||
_statusNotifierWatcher = _connection.CreateProxy<IStatusNotifierWatcher>( |
|||
"org.kde.StatusNotifierWatcher", |
|||
"/StatusNotifierWatcher"); |
|||
} |
|||
catch |
|||
{ |
|||
Logger.TryGet(LogEventLevel.Error, "DBUS") |
|||
?.Log(this, |
|||
"org.kde.StatusNotifierWatcher service is not available on this system. Tray Icons will not work without it."); |
|||
|
|||
return; |
|||
} |
|||
|
|||
_serviceConnected = true; |
|||
} |
|||
|
|||
private async void WatchAsync() |
|||
{ |
|||
try |
|||
{ |
|||
_serviceWatchDisposable = |
|||
await _connection?.ResolveServiceOwnerAsync("org.kde.StatusNotifierWatcher", OnNameChange)!; |
|||
} |
|||
catch (Exception e) |
|||
{ |
|||
Logger.TryGet(LogEventLevel.Error, "DBUS") |
|||
?.Log(this, |
|||
$"Unable to hook watcher method on org.kde.StatusNotifierWatcher: {e}"); |
|||
} |
|||
} |
|||
|
|||
private void OnNameChange(ServiceOwnerChangedEventArgs obj) |
|||
{ |
|||
if (_isDisposed) |
|||
return; |
|||
|
|||
if (!_serviceConnected & obj.NewOwner != null) |
|||
{ |
|||
_serviceConnected = true; |
|||
InitializeSNWService(); |
|||
|
|||
DestroyTrayIcon(); |
|||
|
|||
if (_isVisible) |
|||
{ |
|||
CreateTrayIcon(); |
|||
} |
|||
} |
|||
else if (_serviceConnected & obj.NewOwner is null) |
|||
{ |
|||
DestroyTrayIcon(); |
|||
_serviceConnected = false; |
|||
} |
|||
} |
|||
|
|||
private void CreateTrayIcon() |
|||
{ |
|||
if (_connection is null || !_serviceConnected || _isDisposed) |
|||
return; |
|||
|
|||
var pid = Process.GetCurrentProcess().Id; |
|||
var tid = s_trayIconInstanceId++; |
|||
|
|||
_sysTrayServiceName = $"org.kde.StatusNotifierItem-{pid}-{tid}"; |
|||
_statusNotifierItemDbusObj = new StatusNotifierItemDbusObj(_dbusMenuPath); |
|||
|
|||
try |
|||
{ |
|||
_connection.RegisterObjectAsync(_statusNotifierItemDbusObj); |
|||
_connection.RegisterServiceAsync(_sysTrayServiceName); |
|||
_statusNotifierWatcher?.RegisterStatusNotifierItemAsync(_sysTrayServiceName); |
|||
} |
|||
catch (Exception e) |
|||
{ |
|||
Logger.TryGet(LogEventLevel.Error, "DBUS") |
|||
?.Log(this, $"Error creating a DBus tray icon: {e}."); |
|||
|
|||
_serviceConnected = false; |
|||
} |
|||
|
|||
_statusNotifierItemDbusObj.SetTitleAndTooltip(_tooltipText); |
|||
_statusNotifierItemDbusObj.SetIcon(_icon); |
|||
|
|||
_statusNotifierItemDbusObj.ActivationDelegate += OnClicked; |
|||
} |
|||
|
|||
private void DestroyTrayIcon() |
|||
{ |
|||
if (_connection is null || !_serviceConnected || _isDisposed || _statusNotifierItemDbusObj is null) |
|||
return; |
|||
|
|||
_connection.UnregisterObject(_statusNotifierItemDbusObj); |
|||
_connection.UnregisterServiceAsync(_sysTrayServiceName); |
|||
} |
|||
|
|||
public void Dispose() |
|||
{ |
|||
IsActive = false; |
|||
_isDisposed = true; |
|||
DestroyTrayIcon(); |
|||
_connection?.Dispose(); |
|||
_serviceWatchDisposable?.Dispose(); |
|||
} |
|||
|
|||
public void SetIcon(IWindowIconImpl? icon) |
|||
{ |
|||
if (_isDisposed || IconConverterDelegate is null) |
|||
return; |
|||
|
|||
if (icon is null) |
|||
{ |
|||
_statusNotifierItemDbusObj?.SetIcon(DbusPixmap.EmptyPixmap); |
|||
return; |
|||
} |
|||
|
|||
var x11iconData = IconConverterDelegate(icon); |
|||
|
|||
if (x11iconData.Length == 0) return; |
|||
|
|||
var w = (int)x11iconData[0]; |
|||
var h = (int)x11iconData[1]; |
|||
|
|||
var pixLength = w * h; |
|||
var pixByteArrayCounter = 0; |
|||
var pixByteArray = new byte[w * h * 4]; |
|||
|
|||
for (var i = 0; i < pixLength; i++) |
|||
{ |
|||
var rawPixel = x11iconData[i + 2]; |
|||
pixByteArray[pixByteArrayCounter++] = (byte)((rawPixel & 0xFF000000) >> 24); |
|||
pixByteArray[pixByteArrayCounter++] = (byte)((rawPixel & 0xFF0000) >> 16); |
|||
pixByteArray[pixByteArrayCounter++] = (byte)((rawPixel & 0xFF00) >> 8); |
|||
pixByteArray[pixByteArrayCounter++] = (byte)(rawPixel & 0xFF); |
|||
} |
|||
|
|||
_icon = new DbusPixmap(w, h, pixByteArray); |
|||
_statusNotifierItemDbusObj?.SetIcon(_icon); |
|||
} |
|||
|
|||
public void SetIsVisible(bool visible) |
|||
{ |
|||
if (_isDisposed) |
|||
return; |
|||
|
|||
switch (visible) |
|||
{ |
|||
case true when !_isVisible: |
|||
DestroyTrayIcon(); |
|||
CreateTrayIcon(); |
|||
break; |
|||
case false when _isVisible: |
|||
DestroyTrayIcon(); |
|||
break; |
|||
} |
|||
|
|||
_isVisible = visible; |
|||
} |
|||
|
|||
public void SetToolTipText(string? text) |
|||
{ |
|||
if (_isDisposed || text is null) |
|||
return; |
|||
_tooltipText = text; |
|||
_statusNotifierItemDbusObj?.SetTitleAndTooltip(_tooltipText); |
|||
} |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// DBus Object used for setting system tray icons.
|
|||
/// </summary>
|
|||
/// <remarks>
|
|||
/// Useful guide: https://web.archive.org/web/20210818173850/https://www.notmart.org/misc/statusnotifieritem/statusnotifieritem.html
|
|||
/// </remarks>
|
|||
internal class StatusNotifierItemDbusObj : IStatusNotifierItem |
|||
{ |
|||
private readonly StatusNotifierItemProperties _backingProperties; |
|||
public event Action? OnTitleChanged; |
|||
public event Action? OnIconChanged; |
|||
public event Action? OnAttentionIconChanged; |
|||
public event Action? OnOverlayIconChanged; |
|||
public event Action? OnTooltipChanged; |
|||
public Action<string>? NewStatusAsync { get; set; } |
|||
public Action? ActivationDelegate { get; set; } |
|||
public ObjectPath ObjectPath { get; } |
|||
|
|||
public StatusNotifierItemDbusObj(ObjectPath dbusmenuPath) |
|||
{ |
|||
ObjectPath = new ObjectPath($"/StatusNotifierItem"); |
|||
|
|||
_backingProperties = new StatusNotifierItemProperties |
|||
{ |
|||
Menu = dbusmenuPath, // Needs a dbus menu somehow
|
|||
ToolTip = new ToolTip("") |
|||
}; |
|||
|
|||
InvalidateAll(); |
|||
} |
|||
|
|||
public Task ContextMenuAsync(int x, int y) => Task.CompletedTask; |
|||
|
|||
public Task ActivateAsync(int x, int y) |
|||
{ |
|||
ActivationDelegate?.Invoke(); |
|||
return Task.CompletedTask; |
|||
} |
|||
|
|||
public Task SecondaryActivateAsync(int x, int y) => Task.CompletedTask; |
|||
|
|||
public Task ScrollAsync(int delta, string orientation) => Task.CompletedTask; |
|||
|
|||
public void InvalidateAll() |
|||
{ |
|||
OnTitleChanged?.Invoke(); |
|||
OnIconChanged?.Invoke(); |
|||
OnOverlayIconChanged?.Invoke(); |
|||
OnAttentionIconChanged?.Invoke(); |
|||
OnTooltipChanged?.Invoke(); |
|||
} |
|||
|
|||
public Task<IDisposable> WatchNewTitleAsync(Action handler, Action<Exception> onError) |
|||
{ |
|||
OnTitleChanged += handler; |
|||
return Task.FromResult(Disposable.Create(() => OnTitleChanged -= handler)); |
|||
} |
|||
|
|||
public Task<IDisposable> WatchNewIconAsync(Action handler, Action<Exception> onError) |
|||
{ |
|||
OnIconChanged += handler; |
|||
return Task.FromResult(Disposable.Create(() => OnIconChanged -= handler)); |
|||
} |
|||
|
|||
public Task<IDisposable> WatchNewAttentionIconAsync(Action handler, Action<Exception> onError) |
|||
{ |
|||
OnAttentionIconChanged += handler; |
|||
return Task.FromResult(Disposable.Create(() => OnAttentionIconChanged -= handler)); |
|||
} |
|||
|
|||
public Task<IDisposable> WatchNewOverlayIconAsync(Action handler, Action<Exception> onError) |
|||
{ |
|||
OnOverlayIconChanged += handler; |
|||
return Task.FromResult(Disposable.Create(() => OnOverlayIconChanged -= handler)); |
|||
} |
|||
|
|||
public Task<IDisposable> WatchNewToolTipAsync(Action handler, Action<Exception> onError) |
|||
{ |
|||
OnTooltipChanged += handler; |
|||
return Task.FromResult(Disposable.Create(() => OnTooltipChanged -= handler)); |
|||
} |
|||
|
|||
public Task<IDisposable> WatchNewStatusAsync(Action<string> handler, Action<Exception> onError) |
|||
{ |
|||
NewStatusAsync += handler; |
|||
return Task.FromResult(Disposable.Create(() => NewStatusAsync -= handler)); |
|||
} |
|||
|
|||
public Task<object?> GetAsync(string prop) |
|||
{ |
|||
return Task.FromResult<object?>(prop switch |
|||
{ |
|||
nameof(_backingProperties.Category) => _backingProperties.Category, |
|||
nameof(_backingProperties.Id) => _backingProperties.Id, |
|||
nameof(_backingProperties.Menu) => _backingProperties.Menu, |
|||
nameof(_backingProperties.IconPixmap) => _backingProperties.IconPixmap, |
|||
nameof(_backingProperties.Status) => _backingProperties.Status, |
|||
nameof(_backingProperties.Title) => _backingProperties.Title, |
|||
nameof(_backingProperties.ToolTip) => _backingProperties.ToolTip, |
|||
_ => null |
|||
}); |
|||
} |
|||
|
|||
public Task<StatusNotifierItemProperties> GetAllAsync() => Task.FromResult(_backingProperties); |
|||
|
|||
public Task SetAsync(string prop, object val) => Task.CompletedTask; |
|||
|
|||
public Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler) => |
|||
Task.FromResult(Disposable.Empty); |
|||
|
|||
public void SetIcon(DbusPixmap dbusPixmap) |
|||
{ |
|||
_backingProperties.IconPixmap = new[] { dbusPixmap }; |
|||
InvalidateAll(); |
|||
} |
|||
|
|||
public void SetTitleAndTooltip(string? text) |
|||
{ |
|||
if (text is null) |
|||
return; |
|||
|
|||
_backingProperties.Id = text; |
|||
_backingProperties.Category = "ApplicationStatus"; |
|||
_backingProperties.Status = text; |
|||
_backingProperties.Title = text; |
|||
_backingProperties.ToolTip = new ToolTip(text); |
|||
|
|||
InvalidateAll(); |
|||
} |
|||
} |
|||
|
|||
[DBusInterface("org.kde.StatusNotifierWatcher")] |
|||
internal interface IStatusNotifierWatcher : IDBusObject |
|||
{ |
|||
Task RegisterStatusNotifierItemAsync(string Service); |
|||
Task RegisterStatusNotifierHostAsync(string Service); |
|||
} |
|||
|
|||
[DBusInterface("org.kde.StatusNotifierItem")] |
|||
internal interface IStatusNotifierItem : IDBusObject |
|||
{ |
|||
Task ContextMenuAsync(int x, int y); |
|||
Task ActivateAsync(int x, int y); |
|||
Task SecondaryActivateAsync(int x, int y); |
|||
Task ScrollAsync(int delta, string orientation); |
|||
Task<IDisposable> WatchNewTitleAsync(Action handler, Action<Exception> onError); |
|||
Task<IDisposable> WatchNewIconAsync(Action handler, Action<Exception> onError); |
|||
Task<IDisposable> WatchNewAttentionIconAsync(Action handler, Action<Exception> onError); |
|||
Task<IDisposable> WatchNewOverlayIconAsync(Action handler, Action<Exception> onError); |
|||
Task<IDisposable> WatchNewToolTipAsync(Action handler, Action<Exception> onError); |
|||
Task<IDisposable> WatchNewStatusAsync(Action<string> handler, Action<Exception> onError); |
|||
Task<object?> GetAsync(string prop); |
|||
Task<StatusNotifierItemProperties> GetAllAsync(); |
|||
Task SetAsync(string prop, object val); |
|||
Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler); |
|||
} |
|||
|
|||
// This class is used by Tmds.Dbus to ferry properties
|
|||
// from the SNI spec.
|
|||
// Don't change this to actual C# properties since
|
|||
// Tmds.Dbus will get confused.
|
|||
[Dictionary] |
|||
internal class StatusNotifierItemProperties |
|||
{ |
|||
public string? Category; |
|||
|
|||
public string? Id; |
|||
|
|||
public string? Title; |
|||
|
|||
public string? Status; |
|||
|
|||
public ObjectPath Menu; |
|||
|
|||
public DbusPixmap[]? IconPixmap; |
|||
|
|||
public ToolTip ToolTip; |
|||
} |
|||
|
|||
internal struct ToolTip |
|||
{ |
|||
public readonly string First; |
|||
public readonly DbusPixmap[] Second; |
|||
public readonly string Third; |
|||
public readonly string Fourth; |
|||
|
|||
private static readonly DbusPixmap[] s_blank = |
|||
{ |
|||
new DbusPixmap(0, 0, Array.Empty<byte>()), new DbusPixmap(0, 0, Array.Empty<byte>()) |
|||
}; |
|||
|
|||
public ToolTip(string message) : this("", s_blank, message, "") |
|||
{ |
|||
} |
|||
|
|||
public ToolTip(string first, DbusPixmap[] second, string third, string fourth) |
|||
{ |
|||
First = first; |
|||
Second = second; |
|||
Third = third; |
|||
Fourth = fourth; |
|||
} |
|||
} |
|||
|
|||
internal readonly struct DbusPixmap |
|||
{ |
|||
public readonly int Width; |
|||
public readonly int Height; |
|||
public readonly byte[] Data; |
|||
|
|||
public DbusPixmap(int width, int height, byte[] data) |
|||
{ |
|||
Width = width; |
|||
Height = height; |
|||
Data = data; |
|||
} |
|||
|
|||
public static DbusPixmap EmptyPixmap = new DbusPixmap(1, 1, new byte[] { 255, 0, 0, 0 }); |
|||
} |
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
using System; |
|||
using System.IO; |
|||
using Avalonia.Controls.Platform; |
|||
using Avalonia.Native.Interop; |
|||
using Avalonia.Platform; |
|||
|
|||
#nullable enable |
|||
|
|||
namespace Avalonia.Native |
|||
{ |
|||
internal class TrayIconImpl : ITrayIconImpl |
|||
{ |
|||
private readonly IAvnTrayIcon _native; |
|||
|
|||
public TrayIconImpl(IAvaloniaNativeFactory factory) |
|||
{ |
|||
_native = factory.CreateTrayIcon(); |
|||
|
|||
MenuExporter = new AvaloniaNativeMenuExporter(_native, factory); |
|||
} |
|||
|
|||
public Action? OnClicked { get; set; } |
|||
|
|||
public void Dispose() |
|||
{ |
|||
_native.Dispose(); |
|||
} |
|||
|
|||
public unsafe void SetIcon(IWindowIconImpl? icon) |
|||
{ |
|||
if (icon is null) |
|||
{ |
|||
_native.SetIcon(null, IntPtr.Zero); |
|||
} |
|||
else |
|||
{ |
|||
using (var ms = new MemoryStream()) |
|||
{ |
|||
icon.Save(ms); |
|||
|
|||
var imageData = ms.ToArray(); |
|||
|
|||
fixed (void* ptr = imageData) |
|||
{ |
|||
_native.SetIcon(ptr, new IntPtr(imageData.Length)); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
|
|||
public void SetToolTipText(string? text) |
|||
{ |
|||
// NOP
|
|||
} |
|||
|
|||
public void SetIsVisible(bool visible) |
|||
{ |
|||
_native.SetIsVisible(visible.AsComBool()); |
|||
} |
|||
|
|||
public INativeMenuExporter? MenuExporter { get; } |
|||
} |
|||
} |
|||
@ -1,17 +1,21 @@ |
|||
<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost"> |
|||
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/> |
|||
<Style xmlns="https://github.com/avaloniaui" |
|||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|||
Selector="OverlayPopupHost"> |
|||
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" /> |
|||
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" /> |
|||
<Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" /> |
|||
<Setter Property="FontWeight" Value="400" /> |
|||
<Setter Property="FontStyle" Value="Normal" /> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Panel> |
|||
<Border Name="PART_TransparencyFallback" IsHitTestVisible="False" /> |
|||
<VisualLayerManager IsPopup="True"> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Background="{TemplateBinding Background}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Padding="{TemplateBinding Padding}"/> |
|||
</VisualLayerManager> |
|||
</Panel> |
|||
<!-- Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test --> |
|||
<VisualLayerManager IsPopup="True"> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Background="{TemplateBinding Background}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Padding="{TemplateBinding Padding}"/> |
|||
</VisualLayerManager> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
|
|||
@ -1,17 +1,18 @@ |
|||
<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost"> |
|||
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/> |
|||
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/> |
|||
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/> |
|||
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" /> |
|||
<Setter Property="FontWeight" Value="400" /> |
|||
<Setter Property="FontStyle" Value="Normal" /> |
|||
<Setter Property="Template"> |
|||
<ControlTemplate> |
|||
<Panel> |
|||
<Border Name="PART_TransparencyFallback" IsHitTestVisible="False" /> |
|||
<VisualLayerManager IsPopup="True"> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Background="{TemplateBinding Background}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Padding="{TemplateBinding Padding}"/> |
|||
</VisualLayerManager> |
|||
</Panel> |
|||
<VisualLayerManager IsPopup="True"> |
|||
<ContentPresenter Name="PART_ContentPresenter" |
|||
Background="{TemplateBinding Background}" |
|||
ContentTemplate="{TemplateBinding ContentTemplate}" |
|||
Content="{TemplateBinding Content}" |
|||
Padding="{TemplateBinding Padding}"/> |
|||
</VisualLayerManager> |
|||
</ControlTemplate> |
|||
</Setter> |
|||
</Style> |
|||
|
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue