zune/Xune
0
0
Fork 0
mirror of https://github.com/ZuneDev/Xune.git synced 2026-07-27 13:13:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prevent UIX from blocking UI thread with MainLoop

Browse Source
This commit is contained in:
Yoshi Askharoun
2021-10-06 17:04:15 -05:00
parent 40ba4250e8
commit b2274ea127
6 changed files with 113 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX.RenderApi.Skia/Microsoft/Iris/Render/WpfRenderWindow.WPF.cs
+77 -34
View File
@@ -199,20 +199,31 @@ namespace Microsoft.Iris.Render
}
set
{
if (WpfWindow.Content is Control ctl)
WpfWindow.Dispatcher.Invoke(() =>
{
ctl.Background = new SolidColorBrush(Color.FromArgb(
(byte)(value.A * 255),
(byte)(value.R * 255),
(byte)(value.G * 255),
(byte)(value.B * 255)
));
}
if (WpfWindow.Content is Control ctl)
{
ctl.Background = new SolidColorBrush(Color.FromArgb(
(byte)(value.A * 255),
(byte)(value.R * 255),
(byte)(value.G * 255),
(byte)(value.B * 255)
));
}
});
}
}
public override bool EnableExternalDragDrop
{
get => WpfWindow.AllowDrop;
get
{
bool drop = false;
WpfWindow.Dispatcher.Invoke(() =>
{
drop = WpfWindow.AllowDrop;
});
return drop;
}
set => WpfWindow.AllowDrop = true;
}
public override bool IsDragInProgress { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
@@ -222,17 +233,21 @@ namespace Microsoft.Iris.Render
get => isFullscreen;
set
{
isFullscreen = value;
if (isFullscreen)
WpfWindow.Dispatcher.Invoke(() =>
{
WpfWindow.WindowStyle = WindowStyle.None;
WpfWindow.WindowState = System.Windows.WindowState.Maximized;
}
else
{
WpfWindow.WindowStyle = WindowStyle.SingleBorderWindow;
WpfWindow.WindowState = System.Windows.WindowState.Normal;
}
isFullscreen = value;
if (isFullscreen)
{
WpfWindow.WindowStyle = WindowStyle.None;
WpfWindow.WindowState = System.Windows.WindowState.Maximized;
}
else
{
WpfWindow.WindowStyle = WindowStyle.SingleBorderWindow;
WpfWindow.WindowState = System.Windows.WindowState.Normal;
}
});
}
}
@@ -327,11 +342,22 @@ namespace Microsoft.Iris.Render
public override void ClientToScreen(ref Point point)
{
var p = WpfWindow.PointToScreen(new System.Windows.Point(point.X, point.Y));
point = new Point((int)p.X, (int)p.Y);
var locPoint = point;
WpfWindow.Dispatcher.Invoke(() =>
{
var p = WpfWindow.PointToScreen(new System.Windows.Point(locPoint.X, locPoint.Y));
locPoint = new Point((int)p.X, (int)p.Y);
});
point = locPoint;
}
public override void Close(FormCloseReason fcrCloseReason) => WpfWindow.Close();
public override void Close(FormCloseReason fcrCloseReason)
{
WpfWindow.Dispatcher.Invoke(() =>
{
WpfWindow.Close();
});
}
public override IHwndHostWindow CreateHwndHostWindow()
{
@@ -360,21 +386,32 @@ namespace Microsoft.Iris.Render
public override void Restore()
{
WpfWindow.WindowState = System.Windows.WindowState.Normal;
WpfWindow.Dispatcher.Invoke(() =>
{
WpfWindow.WindowState = System.Windows.WindowState.Normal;
});
}
public override void ScreenToClient(ref Point point)
{
var p = WpfWindow.PointFromScreen(new System.Windows.Point(point.X, point.Y));
point = new Point((int)p.X, (int)p.Y);
var locPoint = point;
WpfWindow.Dispatcher.Invoke(() =>
{
var p = WpfWindow.PointFromScreen(new System.Windows.Point(locPoint.X, locPoint.Y));
locPoint = new Point((int)p.X, (int)p.Y);
});
point = locPoint;
}
public override void SetCapture(IRawInputSite captureSite, bool state)
{
if (state)
WpfWindow.CaptureMouse();
else
WpfWindow.ReleaseMouseCapture();
WpfWindow.Dispatcher.Invoke(() =>
{
if (state)
WpfWindow.CaptureMouse();
else
WpfWindow.ReleaseMouseCapture();
});
}
public override void SetDragDropResult(uint nDragOverResult, uint nDragDropResult)
@@ -389,7 +426,10 @@ namespace Microsoft.Iris.Render
public override void SetIcon(string sModuleName, uint nResourceID, IconFlags nOptions)
{
WpfWindow.Icon = new System.Windows.Media.Imaging.BitmapImage(new Uri(sModuleName));
WpfWindow.Dispatcher.Invoke(() =>
{
WpfWindow.Icon = new System.Windows.Media.Imaging.BitmapImage(new Uri(sModuleName));
});
}
public override void SetMouseIdleOptions(Size sizeMouseIdleTolerance, uint nMouseIdleDelay)
@@ -399,10 +439,13 @@ namespace Microsoft.Iris.Render
public override void SetWindowOptions(WindowOptions options, bool enable)
{
if (options.HasFlag(WindowOptions.FreeformResize))
WpfWindow.ResizeMode = enable ? ResizeMode.CanResize : ResizeMode.NoResize;
if (options.HasFlag(WindowOptions.EnableCursor))
WpfWindow.Cursor = enable ? System.Windows.Input.Cursors.Arrow : System.Windows.Input.Cursors.None;
WpfWindow.Dispatcher.Invoke(() =>
{
if (options.HasFlag(WindowOptions.FreeformResize))
WpfWindow.ResizeMode = enable ? ResizeMode.CanResize : ResizeMode.NoResize;
if (options.HasFlag(WindowOptions.EnableCursor))
WpfWindow.Cursor = enable ? WpfCursors.Arrow : WpfCursors.None;
});
}
public override void TakeFocus() => WpfWindow.Focus();
UIX.Skia/Microsoft/Iris/Application.cs
+4
View File
@@ -145,6 +145,10 @@ namespace Microsoft.Iris
Debug.Assert.IsNotNull(skSurface, nameof(skSurface));
VerifyTrustedEnvironment();
#if DEBUG
Debug.Trace.EnableAllCategories(true);
#endif
s_session = new UISession(skSurface, renderWindow);
s_session.IsRtl = s_IsRTL;
s_session.InputManager.KeyCoalescePolicy = new KeyCoalesceFilter(QueryKeyCoalesce);
UIX.Skia/Microsoft/Iris/Debug/Trace.cs
+7 -3
View File
@@ -128,9 +128,13 @@ namespace Microsoft.Iris.Debug
public static void EnableCategory(TraceCategory cat, bool enabled)
{
byte level = 0;
if (enabled) level = 1;
TraceSettings.SetCategoryLevel(cat, level);
TraceSettings.SetCategoryLevel(cat, (byte)(enabled ? 1 : 0));
}
public static void EnableAllCategories(bool enabled)
{
foreach (Enum e in Enum.GetValues(typeof(TraceCategory)))
EnableCategory((TraceCategory)e, enabled);
}
[Conditional("DEBUG")]
UIX.Skia/Microsoft/Iris/Debug/TraceSettings.cs
+6 -16
View File
@@ -6,7 +6,7 @@
using Microsoft.Iris.OS;
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Security;
namespace Microsoft.Iris.Debug
@@ -14,7 +14,7 @@ namespace Microsoft.Iris.Debug
[SuppressUnmanagedCodeSecurity]
internal static class TraceSettings
{
private static Dictionary<TraceCategory, byte> CategoryLevels = new();
private static ConcurrentDictionary<TraceCategory, byte> CategoryLevels = new();
private static string s_debugTraceFile;
@@ -38,32 +38,22 @@ namespace Microsoft.Iris.Debug
public static byte GetCategoryLevel(TraceCategory cat)
{
if (CategoryLevels.TryGetValue(cat, out byte level))
{
return level;
}
else
{
CategoryLevels.Add(cat, 0);
return GetCategoryLevel(cat);
}
return 0;
}
public static void SetCategoryLevel(TraceCategory cat, byte level)
{
if (CategoryLevels.ContainsKey(cat))
{
CategoryLevels[cat] = level;
}
else
{
CategoryLevels.Add(cat, level);
}
CategoryLevels.AddOrUpdate(cat, level, UpdateValueFactory);
}
public static bool IsFlagsCategory(TraceCategory cat) => false;
private static bool IsExternalCategory(TraceCategory cat) => (uint)cat < 25U;
private static byte UpdateValueFactory(TraceCategory cat, byte level) => level;
public static bool SendOutputToDebugger { get; set; } = true;
public static bool TimedWriteLines { get; set; } = false;
UIX.Skia/Microsoft/Iris/Queues/Dispatcher.cs
+5 -1
View File
@@ -72,7 +72,11 @@ namespace Microsoft.Iris.Queues
QueueItem nextItem = queue.GetNextItem();
if (nextItem != null)
{
SendDebugMessage(nextItem.ToDebugPacketString());
#if DEBUG
string debugString = nextItem.ToDebugPacketString();
SendDebugMessage(debugString);
Debug.Trace.WriteLine(Debug.TraceCategory.Dispatcher, debugString);
#endif
nextItem.Dispatch();
}
else
Xune.Wpf/MainWindow.xaml.cs
+14 -1
View File
@@ -1,4 +1,5 @@
using Microsoft.Iris.Render;
using SkiaSharp;
using SkiaSharp.Views.Desktop;
using System;
using System.Collections.Generic;
@@ -22,10 +23,14 @@ namespace Xune.Wpf
/// </summary>
public partial class MainWindow : Window
{
public static MainWindow Current { get; private set; }
private static SKSurface Surface { get; set; }
public MainWindow()
{
InitializeComponent();
Current = this;
Canvas.PaintSurface += Canvas_PaintSurface;
}
@@ -38,8 +43,16 @@ namespace Xune.Wpf
return;
}
Microsoft.Iris.Application.Initialize(e.Surface, new WpfRenderWindow(this));
Surface = e.Surface;
var initTask = new Task(Init);
initTask.Start();
}
private void Init()
{
Microsoft.Iris.Application.Initialize(Surface, new WpfRenderWindow(this));
Microsoft.Iris.Application.LoadMarkup(@"file://D:\Repos\yoshiask\ZuneUIXTools\test\testA.uix");
Microsoft.Iris.Application.Run();
}
}
}