Skip to content

Commit b973a81

Browse files
authored
Merge pull request #7300 from Mikolaytis/WasmCursors
[WASM] Fix cursors in macOS, fix default cursor set logic
2 parents 9a2b2b9 + 15bcf97 commit b973a81

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,11 @@ protected override void OnAfterRender(bool firstRender)
259259

260260
_inputHelper.Hide();
261261
_canvasHelper.SetCursor("default");
262-
_topLevelImpl.SetCssCursor = _canvasHelper.SetCursor;
262+
_topLevelImpl.SetCssCursor = x =>
263+
{
264+
_inputHelper.SetCursor(x);//macOS
265+
_canvasHelper.SetCursor(x);//windows
266+
};
263267

264268
Console.WriteLine("starting html canvas setup");
265269
_interop = await SKHtmlCanvasInterop.ImportAsync(Js, _htmlCanvas, OnRenderFrame);

src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,11 @@ public void SetInputRoot(IInputRoot inputRoot)
127127

128128
public void SetCursor(ICursorImpl cursor)
129129
{
130-
var cur = cursor as CssCursor;
131-
var val = CssCursor.Default;
132-
if (cur != null && cur.Value != null)
133-
{
134-
val = cur.Value;
135-
}
130+
var val = (cursor as CssCursor)?.Value ?? CssCursor.Default;
136131
if (_currentCursor != val)
137132
{
138133
SetCssCursor?.Invoke(val);
134+
_currentCursor = val;
139135
}
140136
}
141137

0 commit comments

Comments
 (0)