From 4011cb3f4944a31c23b15913ce3630e77a0464a9 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 20 May 2020 11:27:23 -0300 Subject: [PATCH] Use Hint/Actual naming --- .../Embedding/Offscreen/OffscreenTopLevelImpl.cs | 2 +- src/Avalonia.Controls/Platform/ITopLevelImpl.cs | 7 +++++-- src/Avalonia.Controls/TopLevel.cs | 4 ++-- src/Avalonia.DesignerSupport/Remote/Stubs.cs | 2 +- src/Avalonia.Native/WindowImplBase.cs | 2 +- src/Avalonia.X11/X11Window.cs | 2 +- .../Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs | 2 +- src/Windows/Avalonia.Win32/WindowImpl.cs | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs index 5d7c968173..625acb17c3 100644 --- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs +++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs @@ -65,7 +65,7 @@ namespace Avalonia.Controls.Embedding.Offscreen public Action Closed { get; set; } public abstract IMouseDevice MouseDevice { get; } - public WindowTransparencyLevel TransparencyLevel { get => WindowTransparencyLevel.None; set { } } + public WindowTransparencyLevel TransparencyLevelHint { get => WindowTransparencyLevel.None; set { } } public IPopupImpl CreatePopup() => null; } diff --git a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs index b22962115e..4bcfaf91d6 100644 --- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs +++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs @@ -59,6 +59,9 @@ namespace Avalonia.Platform /// Action ScalingChanged { get; set; } + /// + /// Gets or sets a method called when the toplevel's TransparencyLevel changes. + /// Action TransparencyLevelChanged { get; set; } /// @@ -111,8 +114,8 @@ namespace Avalonia.Platform IPopupImpl CreatePopup(); /// - /// Gets or sets the ofthe TopLevel. + /// Gets or sets the of the TopLevel. /// - WindowTransparencyLevel TransparencyLevel { get; set; } + WindowTransparencyLevel TransparencyLevelHint { get; set; } } } diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs index 55212eb3dc..1bf33acf42 100644 --- a/src/Avalonia.Controls/TopLevel.cs +++ b/src/Avalonia.Controls/TopLevel.cs @@ -83,7 +83,7 @@ namespace Avalonia.Controls AffectsMeasure(ClientSizeProperty); TransparencyLevelHintProperty.Changed.AddClassHandler( - (tl, e) => { if (tl.PlatformImpl != null) tl.PlatformImpl.TransparencyLevel = (WindowTransparencyLevel)e.NewValue; }); + (tl, e) => { if (tl.PlatformImpl != null) tl.PlatformImpl.TransparencyLevelHint = (WindowTransparencyLevel)e.NewValue; }); } /// @@ -402,7 +402,7 @@ namespace Avalonia.Controls _transparencyFallbackBorder = e.NameScope.Find("PART_TransparencyFallback"); - HandleTransparencyLevelChanged(PlatformImpl.TransparencyLevel); + HandleTransparencyLevelChanged(PlatformImpl.TransparencyLevelHint); } /// diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs index 0b5d2cb2b9..95284f18fe 100644 --- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs +++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs @@ -144,7 +144,7 @@ namespace Avalonia.DesignerSupport.Remote public Action GotInputWhenDisabled { get; set; } - public WindowTransparencyLevel TransparencyLevel { get => WindowTransparencyLevel.None; set { } } + public WindowTransparencyLevel TransparencyLevelHint { get => WindowTransparencyLevel.None; set { } } } class ClipboardStub : IClipboard diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs index 2442c2cba4..5852675fb6 100644 --- a/src/Avalonia.Native/WindowImplBase.cs +++ b/src/Avalonia.Native/WindowImplBase.cs @@ -393,7 +393,7 @@ namespace Avalonia.Native private WindowTransparencyLevel _transparencyLevel; - public WindowTransparencyLevel TransparencyLevel + public WindowTransparencyLevel TransparencyLevelHint { get => _transparencyLevel; set diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index 84f0b8c877..6006135a2b 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -1086,6 +1086,6 @@ namespace Avalonia.X11 public IPopupPositioner PopupPositioner { get; } public ITopLevelNativeMenuExporter NativeMenuExporter { get; } - public WindowTransparencyLevel TransparencyLevel { get; set; } + public WindowTransparencyLevel TransparencyLevelHint { get; set; } } } diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs index fa518bafec..3f50e1e4eb 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs @@ -83,6 +83,6 @@ namespace Avalonia.LinuxFramebuffer public Size ScaledSize => _outputBackend.PixelSize.ToSize(Scaling); - public WindowTransparencyLevel TransparencyLevel { get => WindowTransparencyLevel.None; set { } } + public WindowTransparencyLevel TransparencyLevelHint { get => WindowTransparencyLevel.None; set { } } } } diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index 2cf87c1556..005df2b99b 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -210,7 +210,7 @@ namespace Avalonia.Win32 } } - public WindowTransparencyLevel TransparencyLevel + public WindowTransparencyLevel TransparencyLevelHint { get => _transparencyLevel; set