-
class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
{
private:
+ bool _isEnabled;
bool _canResize;
bool _fullScreenActive;
SystemDecorations _decorations;
@@ -22,6 +24,8 @@ private:
bool _transitioningWindowState;
bool _isClientAreaExtended;
bool _isDialog;
+ WindowImpl* _parent;
+ std::list
+## Commercial Support
+
+We have a range of [support plans available](https://avaloniaui.net/support.html) for those looking to partner with the creators of Avalonia, enabling access to the best support at every step of the development process.
+
+*Please note that donations are not considered payment for commercial support agreements. Please contact us to discuss your needs first. [team@avaloniaui.net](mailto://team@avaloniaui.net)*
## .NET Foundation
This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index 2c6ff74e5e..bd6054327f 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -5,6 +5,7 @@
+ @onwheel="OnWheel"
+ @onkeydown="OnKeyDown"
+ @onkeyup="OnKeyUp"
+ @onpointerdown="OnPointerDown"
+ @onpointerup="OnPointerUp"
+ @onpointermove="OnPointerMove"
+ @onpointercancel="OnPointerCancel">
-
-
-
+
+
+
+
+
+
+
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
index 1ccf53943a..b575bc6dbb 100644
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
@@ -1,5 +1,6 @@
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Controls.Embedding;
+using Avalonia.Controls.Platform;
using Avalonia.Input;
using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
@@ -18,14 +19,16 @@ namespace Avalonia.Web.Blazor
private EmbeddableControlRoot _topLevel;
// Interop
- private SKHtmlCanvasInterop _interop = null!;
- private SizeWatcherInterop _sizeWatcher = null!;
- private DpiWatcherInterop _dpiWatcher = null!;
- private SKHtmlCanvasInterop.GLInfo? _jsGlInfo = null!;
- private InputHelperInterop _inputHelper = null!;
- private InputHelperInterop _canvasHelper = null!;
+ private SKHtmlCanvasInterop? _interop = null;
+ private SizeWatcherInterop? _sizeWatcher = null;
+ private DpiWatcherInterop? _dpiWatcher = null;
+ private SKHtmlCanvasInterop.GLInfo? _jsGlInfo = null;
+ private InputHelperInterop? _inputHelper = null;
+ private InputHelperInterop? _canvasHelper = null;
+ private NativeControlHostInterop? _nativeControlHost = null;
private ElementReference _htmlCanvas;
private ElementReference _inputElement;
+ private ElementReference _nativeControlsContainer;
private double _dpi = 1;
private SKSize _canvasSize = new (100, 100);
@@ -49,89 +52,91 @@ namespace Avalonia.Web.Blazor
}
}
- private void OnTouchStart(TouchEventArgs e)
+ internal INativeControlHostImpl GetNativeControlHostImpl()
{
- foreach (var touch in e.ChangedTouches)
- {
- _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchBegin, new Point(touch.ClientX, touch.ClientY),
- GetModifiers(e), touch.Identifier);
- }
+ return _nativeControlHost ?? throw new InvalidOperationException("Blazor View wasn't initialized yet");
}
-
- private void OnTouchEnd(TouchEventArgs e)
+
+ private void OnPointerCancel(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
{
- foreach (var touch in e.ChangedTouches)
+ if (e.PointerType == "touch")
{
- _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchEnd, new Point(touch.ClientX, touch.ClientY),
- GetModifiers(e), touch.Identifier);
+ _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchCancel, new Point(e.ClientX, e.ClientY),
+ GetModifiers(e), e.PointerId);
}
}
- private void OnTouchCancel(TouchEventArgs e)
+ private void OnPointerMove(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
{
- foreach (var touch in e.ChangedTouches)
+ if (e.PointerType == "touch")
{
- _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchCancel, new Point(touch.ClientX, touch.ClientY),
- GetModifiers(e), touch.Identifier);
+ _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchUpdate, new Point(e.ClientX, e.ClientY),
+ GetModifiers(e), e.PointerId);
}
- }
-
- private void OnTouchMove(TouchEventArgs e)
- {
- foreach (var touch in e.ChangedTouches)
+ else
{
- _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchUpdate, new Point(touch.ClientX, touch.ClientY),
- GetModifiers(e), touch.Identifier);
+ _topLevelImpl.RawMouseEvent(RawPointerEventType.Move, new Point(e.ClientX, e.ClientY), GetModifiers(e));
}
}
- private void OnMouseMove(MouseEventArgs e)
+ private void OnPointerUp(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
{
- _topLevelImpl.RawMouseEvent(RawPointerEventType.Move, new Point(e.ClientX, e.ClientY), GetModifiers(e));
- }
+ if (e.PointerType == "touch")
+ {
+ _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchEnd, new Point(e.ClientX, e.ClientY),
+ GetModifiers(e), e.PointerId);
+ }
+ else
+ {
+ RawPointerEventType type = default;
- private void OnMouseUp(MouseEventArgs e)
- {
- RawPointerEventType type = default;
+ switch (e.Button)
+ {
+ case 0:
+ type = RawPointerEventType.LeftButtonUp;
+ break;
- switch (e.Button)
- {
- case 0:
- type = RawPointerEventType.LeftButtonUp;
- break;
+ case 1:
+ type = RawPointerEventType.MiddleButtonUp;
+ break;
- case 1:
- type = RawPointerEventType.MiddleButtonUp;
- break;
+ case 2:
+ type = RawPointerEventType.RightButtonUp;
+ break;
+ }
- case 2:
- type = RawPointerEventType.RightButtonUp;
- break;
+ _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
}
-
- _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
}
- private void OnMouseDown(MouseEventArgs e)
+ private void OnPointerDown(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
{
- RawPointerEventType type = default;
-
- switch (e.Button)
+ if (e.PointerType == "touch")
{
- case 0:
- type = RawPointerEventType.LeftButtonDown;
- break;
+ _topLevelImpl.RawTouchEvent(RawPointerEventType.TouchBegin, new Point(e.ClientX, e.ClientY),
+ GetModifiers(e), e.PointerId);
+ }
+ else
+ {
+ RawPointerEventType type = default;
- case 1:
- type = RawPointerEventType.MiddleButtonDown;
- break;
+ switch (e.Button)
+ {
+ case 0:
+ type = RawPointerEventType.LeftButtonDown;
+ break;
- case 2:
- type = RawPointerEventType.RightButtonDown;
- break;
- }
+ case 1:
+ type = RawPointerEventType.MiddleButtonDown;
+ break;
- _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
+ case 2:
+ type = RawPointerEventType.RightButtonDown;
+ break;
+ }
+
+ _topLevelImpl.RawMouseEvent(type, new Point(e.ClientX, e.ClientY), GetModifiers(e));
+ }
}
private void OnWheel(WheelEventArgs e)
@@ -165,23 +170,7 @@ namespace Avalonia.Web.Blazor
return modifiers;
}
- private static RawInputModifiers GetModifiers(TouchEventArgs e)
- {
- var modifiers = RawInputModifiers.None;
-
- if (e.CtrlKey)
- modifiers |= RawInputModifiers.Control;
- if (e.AltKey)
- modifiers |= RawInputModifiers.Alt;
- if (e.ShiftKey)
- modifiers |= RawInputModifiers.Shift;
- if (e.MetaKey)
- modifiers |= RawInputModifiers.Meta;
-
- return modifiers;
- }
-
- private static RawInputModifiers GetModifiers(MouseEventArgs e)
+ private static RawInputModifiers GetModifiers(Microsoft.AspNetCore.Components.Web.PointerEventArgs e)
{
var modifiers = RawInputModifiers.None;
@@ -224,12 +213,12 @@ namespace Avalonia.Web.Blazor
private void OnKeyDown(KeyboardEventArgs e)
{
- _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Code, GetModifiers(e));
+ _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, e.Code, e.Key, GetModifiers(e));
}
private void OnKeyUp(KeyboardEventArgs e)
{
- _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, GetModifiers(e));
+ _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyUp, e.Code, e.Key, GetModifiers(e));
}
private void OnInput(ChangeEventArgs e)
@@ -243,7 +232,7 @@ namespace Avalonia.Web.Blazor
}
}
- _inputHelper.Clear();
+ _inputHelper?.Clear();
}
[Parameter(CaptureUnmatchedValues = true)]
@@ -253,6 +242,8 @@ namespace Avalonia.Web.Blazor
{
if (firstRender)
{
+ AvaloniaLocator.CurrentMutable.Bind