Browse Source

fix merge issues.

release/0.10.7
Dan Walmsley 5 years ago
parent
commit
f20d185487
  1. 3
      native/Avalonia.Native/src/OSX/window.mm

3
native/Avalonia.Native/src/OSX/window.mm

@ -264,7 +264,6 @@ public:
virtual HRESULT Resize(double x, double y, AvnPlatformResizeReason reason) override
{
START_COM_CALL;
if(_inResize)
{
return S_OK;
@ -1746,7 +1745,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
_isMouseOver = false;
[self mouseEvent:event withType:LeaveWindow];
[super mouseExited:event];
}
}
- (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
{

Loading…
Cancel
Save