Browse Source

Merge branch 'master' of github.com:AvaloniaUI/Avalonia.Native

pull/1977/head
Nikita Tsukanov 8 years ago
parent
commit
3c9490391e
  1. 10
      src/Avalonia.Native/PopupImpl.cs
  2. 3
      src/Avalonia.Native/WindowImplBase.cs

10
src/Avalonia.Native/PopupImpl.cs

@ -9,22 +9,14 @@ namespace Avalonia.Native
{
public class PopupImpl : WindowBaseImpl, IPopupImpl
{
IAvnPopup _native;
public PopupImpl(IAvaloniaNativeFactory factory)
{
using (var e = new PopupEvents(this))
{
Init(_native = factory.CreatePopup(e), factory.CreateScreens());
Init(factory.CreatePopup(e), factory.CreateScreens());
}
}
public override void Dispose()
{
_native.Dispose();
base.Dispose();
}
class PopupEvents : WindowBaseEvents, IAvnWindowEvents
{
readonly PopupImpl _parent;

3
src/Avalonia.Native/WindowImplBase.cs

@ -1,4 +1,4 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
@ -20,7 +20,6 @@ namespace Avalonia.Native
{
IInputRoot _inputRoot;
IAvnWindowBase _native;
bool _isClosed;
private object _syncRoot = new object();
private bool _deferredRendering = false;
private bool _gpu = false;

Loading…
Cancel
Save