Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[OSX] Use non-opaque window background for non-transparent windows #9469

Merged
merged 3 commits into from
Nov 19, 2022
Merged

[OSX] Use non-opaque window background for non-transparent windows #9469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb1469d
[OSX] Use non-opaque window background for non-transparent windows
kekekeks Nov 18, 2022
14feb3f
Merge branch 'master' into fixes/window-border-for-opaque-windows
Nov 19, 2022
51617e0
Merge branch 'master' into fixes/window-border-for-opaque-windows
kekekeks Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions native/Avalonia.Native/src/OSX/AvnWindow.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,7 @@ -(CLASS_NAME*_Nonnull) initWithParent: (WindowBaseImpl*_Nonnull) parent content
_closed = false;
_isEnabled = true;

[self backingScaleFactor];
[self setOpaque:NO];
[self setBackgroundColor: [NSColor clearColor]];

_isExtended = false;
_isTransitioningToFullScreen = false;
Expand Down
2 changes: 1 addition & 1 deletion native/Avalonia.Native/src/OSX/WindowBaseImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ BEGIN_INTERFACE_MAP()

virtual HRESULT CreateNativeControlHost(IAvnNativeControlHost **retOut) override;

virtual HRESULT SetBlurEnabled(bool enable) override;
virtual HRESULT SetTransparencyMode(AvnWindowTransparencyMode mode) override;

virtual HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
IAvnClipboard *clipboard, IAvnDndResultCallback *cb,
Expand Down
5 changes: 3 additions & 2 deletions native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,10 +489,11 @@
return S_OK;
}

HRESULT WindowBaseImpl::SetBlurEnabled(bool enable) {
HRESULT WindowBaseImpl::SetTransparencyMode(AvnWindowTransparencyMode mode) {
START_COM_CALL;

[StandardContainer ShowBlur:enable];
[Window setBackgroundColor: (mode != Transparent ? [NSColor windowBackgroundColor] : [NSColor clearColor])];
[StandardContainer ShowBlur: mode == Blur];

return S_OK;
}
Expand Down
16 changes: 7 additions & 9 deletions src/Avalonia.Native/WindowImplBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,19 +501,17 @@ public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
{
if (TransparencyLevel != transparencyLevel)
{
if (transparencyLevel >= WindowTransparencyLevel.Blur)
{
if (transparencyLevel > WindowTransparencyLevel.Transparent)
transparencyLevel = WindowTransparencyLevel.AcrylicBlur;
}

if(transparencyLevel == WindowTransparencyLevel.None)
{
transparencyLevel = WindowTransparencyLevel.Transparent;
}

TransparencyLevel = transparencyLevel;

_native?.SetBlurEnabled((TransparencyLevel >= WindowTransparencyLevel.Blur).AsComBool());
_native.SetTransparencyMode(transparencyLevel == WindowTransparencyLevel.None
? AvnWindowTransparencyMode.Opaque
: transparencyLevel == WindowTransparencyLevel.Transparent
? AvnWindowTransparencyMode.Transparent
: AvnWindowTransparencyMode.Blur);

TransparencyLevelChanged?.Invoke(TransparencyLevel);
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/Avalonia.Native/avn.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,13 @@ enum AvnAutomationControlType
AutomationSeparator,
}

enum AvnWindowTransparencyMode
{
Opaque,
Transparent,
Blur
}

[uuid(809c652e-7396-11d2-9771-00a0c9b4d50c)]
interface IAvaloniaNativeFactory : IUnknown
{
Expand Down Expand Up @@ -527,7 +534,7 @@ interface IAvnWindowBase : IUnknown
HRESULT CreateNativeControlHost(IAvnNativeControlHost** retOut);
HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
IAvnClipboard* clipboard, IAvnDndResultCallback* cb, [intptr]void* sourceHandle);
HRESULT SetBlurEnabled(bool enable);
HRESULT SetTransparencyMode(AvnWindowTransparencyMode mode);
}

[uuid(83e588f3-6981-4e48-9ea0-e1e569f79a91), cpp-virtual-inherits]
Expand Down