From 54e4f13ea6fd90d99416bcd039d0e522fbfcbe3c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 17 Dec 2021 16:30:47 +0000 Subject: [PATCH] Revert "[OSX] fix resize calls before window shown." This reverts commit 06807324d022da8a5031991e5d6082440e22d2c5. --- native/Avalonia.Native/src/OSX/window.mm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm index 3ee9e2214c..0b88908252 100644 --- a/native/Avalonia.Native/src/OSX/window.mm +++ b/native/Avalonia.Native/src/OSX/window.mm @@ -27,7 +27,6 @@ public: AvnPoint lastPositionSet; NSString* _lastTitle; IAvnMenu* _mainMenu; - NSSize _lastSize; bool _shown; bool _inResize; @@ -36,7 +35,6 @@ public: { _shown = false; _inResize = false; - _lastSize = NSSize { 0, 0 }; _mainMenu = nullptr; BaseEvents = events; _glContext = gl; @@ -227,17 +225,9 @@ public: if(ret == nullptr) return E_POINTER; - if(!_shown) - { - ret->Width = _lastSize.width; - ret->Height = _lastSize.height; - } - else - { - auto frame = [View frame]; - ret->Width = frame.size.width; - ret->Height = frame.size.height; - } + auto frame = [View frame]; + ret->Width = frame.size.width; + ret->Height = frame.size.height; return S_OK; } @@ -332,8 +322,6 @@ public: @try { - _lastSize = NSSize{x,y}; - if(!_shown) { BaseEvents->Resized(AvnSize{x,y}, reason);