emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix deadlock in mouse input on Avalonia (#3444)

Browse source 
* fix deadlock in mouse input

* apply @AcK77 changes
This commit is contained in:
Emmanuel Hansen 2022-07-08 12:53:48 +00:00 committed by GitHub
parent 55e97959b9
commit bc5bb4459e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
View file

@ -1,3 +1,4 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Threading; using Avalonia.Threading;
@ -13,6 +14,7 @@ namespace Ryujinx.Ava.Input
{ {
private Control _widget; private Control _widget;
private bool _isDisposed; private bool _isDisposed;
private Size _size;
public bool[] PressedButtons { get; } public bool[] PressedButtons { get; }
@ -29,6 +31,14 @@ namespace Ryujinx.Ava.Input
_widget.PointerWheelChanged += Parent_ScrollEvent; _widget.PointerWheelChanged += Parent_ScrollEvent;
PressedButtons = new bool[(int)MouseButton.Count]; PressedButtons = new bool[(int)MouseButton.Count];
_size = new Size((int)parent.Bounds.Width, (int)parent.Bounds.Height);
parent.GetObservable(Control.BoundsProperty).Subscribe(Resized);
}
private void Resized(Rect rect)
{
_size = new Size((int)rect.Width, (int)rect.Height);
} }
private void Parent_ScrollEvent(object o, PointerWheelEventArgs args) private void Parent_ScrollEvent(object o, PointerWheelEventArgs args)
@ -78,14 +88,7 @@ namespace Ryujinx.Ava.Input
public Size GetClientSize() public Size GetClientSize()
{ {
Size size = new(); return _size;
Dispatcher.UIThread.InvokeAsync(() =>
{
size = new Size((int)_widget.Bounds.Width, (int)_widget.Bounds.Height);
}).Wait();
return size;
} }
public string DriverName => "Avalonia"; public string DriverName => "Avalonia";