tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed WPF toplevel

pull/2581/head
Nikita Tsukanov 7 years ago
parent
f97c0c6368
commit
72b1232449
1 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs

24
src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
View File

@ -160,19 +160,19 @@ namespace Avalonia.Win32.Interop.Wpf
return rv; return rv;
} }
void MouseEvent(RawMouseEventType type, MouseEventArgs e) void MouseEvent(RawPointerEventType type, MouseEventArgs e)
=> _ttl.Input?.Invoke(new RawMouseEventArgs(_mouse, (uint)e.Timestamp, _inputRoot, type, => _ttl.Input?.Invoke(new RawPointerEventArgs(_mouse, (uint)e.Timestamp, _inputRoot, type,
e.GetPosition(this).ToAvaloniaPoint(), GetModifiers())); e.GetPosition(this).ToAvaloniaPoint(), GetModifiers()));
protected override void OnMouseDown(MouseButtonEventArgs e) protected override void OnMouseDown(MouseButtonEventArgs e)
{ {
RawMouseEventType type; RawPointerEventType type;
if(e.ChangedButton == MouseButton.Left) if(e.ChangedButton == MouseButton.Left)
type = RawMouseEventType.LeftButtonDown; type = RawPointerEventType.LeftButtonDown;
else if (e.ChangedButton == MouseButton.Middle) else if (e.ChangedButton == MouseButton.Middle)
type = RawMouseEventType.MiddleButtonDown; type = RawPointerEventType.MiddleButtonDown;
else if (e.ChangedButton == MouseButton.Right) else if (e.ChangedButton == MouseButton.Right)
type = RawMouseEventType.RightButtonDown; type = RawPointerEventType.RightButtonDown;
else else
return; return;
MouseEvent(type, e); MouseEvent(type, e);
@ -181,13 +181,13 @@ namespace Avalonia.Win32.Interop.Wpf
protected override void OnMouseUp(MouseButtonEventArgs e) protected override void OnMouseUp(MouseButtonEventArgs e)
{ {
RawMouseEventType type; RawPointerEventType type;
if (e.ChangedButton == MouseButton.Left) if (e.ChangedButton == MouseButton.Left)
type = RawMouseEventType.LeftButtonUp; type = RawPointerEventType.LeftButtonUp;
else if (e.ChangedButton == MouseButton.Middle) else if (e.ChangedButton == MouseButton.Middle)
type = RawMouseEventType.MiddleButtonUp; type = RawPointerEventType.MiddleButtonUp;
else if (e.ChangedButton == MouseButton.Right) else if (e.ChangedButton == MouseButton.Right)
type = RawMouseEventType.RightButtonUp; type = RawPointerEventType.RightButtonUp;
else else
return; return;
MouseEvent(type, e); MouseEvent(type, e);
@ -196,14 +196,14 @@ namespace Avalonia.Win32.Interop.Wpf
protected override void OnMouseMove(MouseEventArgs e) protected override void OnMouseMove(MouseEventArgs e)
{ {
MouseEvent(RawMouseEventType.Move, e); MouseEvent(RawPointerEventType.Move, e);
} }
protected override void OnMouseWheel(MouseWheelEventArgs e) => protected override void OnMouseWheel(MouseWheelEventArgs e) =>
_ttl.Input?.Invoke(new RawMouseWheelEventArgs(_mouse, (uint) e.Timestamp, _inputRoot, _ttl.Input?.Invoke(new RawMouseWheelEventArgs(_mouse, (uint) e.Timestamp, _inputRoot,
e.GetPosition(this).ToAvaloniaPoint(), new Vector(0, e.Delta), GetModifiers())); e.GetPosition(this).ToAvaloniaPoint(), new Vector(0, e.Delta), GetModifiers()));
protected override void OnMouseLeave(MouseEventArgs e) => MouseEvent(RawMouseEventType.LeaveWindow, e); protected override void OnMouseLeave(MouseEventArgs e) => MouseEvent(RawPointerEventType.LeaveWindow, e);
protected override void OnKeyDown(KeyEventArgs e) protected override void OnKeyDown(KeyEventArgs e)
=> _ttl.Input?.Invoke(new RawKeyEventArgs(_keyboard, (uint) e.Timestamp, RawKeyEventType.KeyDown, => _ttl.Input?.Invoke(new RawKeyEventArgs(_keyboard, (uint) e.Timestamp, RawKeyEventType.KeyDown,

Write Preview
Loading…
Cancel
Save