Browse Source

Revert "remove redundant api GetFrameSize."

This reverts commit 05e6c9cfd9.
pull/8154/head
Dan Walmsley 4 years ago
parent
commit
b9bbd6ff0f
  1. 2
      native/Avalonia.Native/src/OSX/WindowBaseImpl.h
  2. 17
      native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
  3. 1
      src/Avalonia.Native/avn.idl

2
native/Avalonia.Native/src/OSX/WindowBaseImpl.h

@ -72,6 +72,8 @@ BEGIN_INTERFACE_MAP()
virtual HRESULT GetClientSize(AvnSize *ret) override;
virtual HRESULT GetFrameSize(AvnSize *ret) override;
virtual HRESULT GetScaling(double *ret) override;
virtual HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize) override;

17
native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

@ -191,7 +191,22 @@ HRESULT WindowBaseImpl::GetClientSize(AvnSize *ret) {
if (ret == nullptr)
return E_POINTER;
auto frame = [View.frame];
auto frame = [View frame];
ret->Width = frame.size.width;
ret->Height = frame.size.height;
return S_OK;
}
}
HRESULT WindowBaseImpl::GetFrameSize(AvnSize *ret) {
START_COM_CALL;
@autoreleasepool {
if (ret == nullptr)
return E_POINTER;
auto frame = [Window frame];
ret->Width = frame.size.width;
ret->Height = frame.size.height;

1
src/Avalonia.Native/avn.idl

@ -504,6 +504,7 @@ interface IAvnWindowBase : IUnknown
HRESULT Close();
HRESULT Activate();
HRESULT GetClientSize(AvnSize*ret);
HRESULT GetFrameSize(AvnSize*ret);
HRESULT GetScaling(double*ret);
HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
HRESULT Resize(double width, double height, AvnPlatformResizeReason reason);

Loading…
Cancel
Save