Merge branch 'master' into feature/design-tools

michael-hawker · web-flow · commit ea949d6f32be · 2020-12-08T00:55:23.000-08:00
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs
@@ -21,6 +21,8 @@ public sealed partial class XamlCodeEditor : UserControl
         public static readonly DependencyProperty TextProperty =
             DependencyProperty.Register(nameof(Text), typeof(string), typeof(XamlCodeEditor), new PropertyMetadata(string.Empty));
 
+        private ThemeListener _themeListener = new ThemeListener();
+
         public XamlCodeEditor()
         {
             this.InitializeComponent();
@@ -40,7 +42,7 @@ public async void ReportError(XamlExceptionRange error)
             // Highlight Error Line
             XamlCodeRenderer.Decorations.Add(new IModelDeltaDecoration(
                 range,
-                new IModelDecorationOptions() { IsWholeLine = true, ClassName = _errorStyle, HoverMessage = new string[] { error.Message }.ToMarkdownString() }));
+                new IModelDecorationOptions() { IsWholeLine = true, ClassName = ErrorStyle, HoverMessage = new string[] { error.Message }.ToMarkdownString() }));
 
             // Show Glyph Icon
             XamlCodeRenderer.Decorations.Add(new IModelDeltaDecoration(
@@ -121,10 +123,12 @@ public string Text
 
         public DateTime TimeSampleEditedLast { get; private set; } = DateTime.MinValue;
 
-        private CssLineStyle _errorStyle = new CssLineStyle()
+        private CssLineStyle ErrorStyle
         {
-            BackgroundColor = new SolidColorBrush(Color.FromArgb(0x00, 0xFF, 0xD6, 0xD6))
-        };
+            get => _themeListener.CurrentTheme.Equals(ApplicationTheme.Light) ?
+                new CssLineStyle() { BackgroundColor = new SolidColorBrush(Color.FromArgb(0x00, 0xFF, 0xD6, 0xD6)) } :
+                new CssLineStyle() { BackgroundColor = new SolidColorBrush(Color.FromArgb(0x00, 0x66, 0x00, 0x00)) };
+        }
 
         private CssGlyphStyle _errorIconStyle = new CssGlyphStyle()
         {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DispatcherQueueHelper/DispatcherQueueHelperPage.xaml.cs
@@ -3,10 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.System;
 using Windows.UI.Xaml;
-using Microsoft.Toolkit.Uwp.Extensions;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Numerics;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.SampleApp.Pages;
 using Microsoft.Toolkit.Uwp.UI.Animations;
@@ -147,7 +148,7 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
                     ShowSamplePicker(category.Samples, true);
 
                     // Then Focus on Picker
-                    DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
+                    dispatcherQueue.EnqueueAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
                 }
             }
             else if (args.IsSettingsInvoked)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
@@ -76,7 +77,7 @@ private void SearchBox_KeyDown(object sender, Windows.UI.Xaml.Input.KeyRoutedEve
             if (e.Key == Windows.System.VirtualKey.Down && SamplePickerGrid.Visibility == Windows.UI.Xaml.Visibility.Visible)
             {
                 // If we try and navigate down out of the textbox (and there's search results), go to the search results.
-                DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
+                dispatcherQueue.EnqueueAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs
@@ -7,7 +7,6 @@
 using Microsoft.Toolkit.Uwp.SampleApp.Pages;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.System;
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Animation;
 using Windows.UI.Xaml.Navigation;
@@ -16,6 +15,8 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
 {
     public sealed partial class Shell
     {
+        private readonly DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
         public static Shell Current { get; private set; }
 
         public Shell()
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionFunctions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionFunctions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
@@ -502,6 +502,15 @@ private string ToExpressionStringInternal()
                     ret = $"({Children[0].ToExpressionStringInternal()} {GetOperationString()} {Children[1].ToExpressionStringInternal()})";
                     break;
 
+                case OperationType.UnaryOperator:
+                    if (Children.Count != 1)
+                    {
+                        throw new Exception("Can't have an unary operator that doesn't have exactly one params");
+                    }
+
+                    ret = $"( {GetOperationString()} {Children[0].ToExpressionStringInternal()} )";
+                    break;
+
                 case OperationType.Constant:
                     if (Children.Count == 0)
                     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/OperationType.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/OperationType.cs
@@ -15,10 +15,15 @@ internal enum OperationType
         Function,
 
         /// <summary>
-        /// The operator
+        /// The operator (takes two operands)
         /// </summary>
         Operator,
 
+        /// <summary>
+        /// The operator that only takes one operand
+        /// </summary>
+        UnaryOperator,
+
         /// <summary>
         /// The constant
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Extensions/AnimationExtensions.Light.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
-using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Composition.Effects;
@@ -102,7 +102,7 @@ public static AnimationSet Light(
             var task = new AnimationTask();
             task.AnimationSet = animationSet;
 
-            task.Task = DispatcherHelper.ExecuteOnUIThreadAsync(
+            task.Task = visual.DispatcherQueue.EnqueueAsync(
                 () =>
             {
                 const string sceneName = "PointLightScene";
@@ -184,7 +184,7 @@ public static AnimationSet Light(
                 }
 
                 pointLights[visual] = pointLight;
-            }, Windows.UI.Core.CoreDispatcherPriority.Normal);
+            });
 
             animationSet.AddAnimationThroughTask(task);
             return animationSet;
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ScrollViewer/ScrollViewerExtensions.MiddleClickScrolling.cs
@@ -162,10 +162,7 @@ private static void Scroll(object state)
                 offsetX = offsetX > _maxSpeed ? _maxSpeed : offsetX;
                 offsetY = offsetY > _maxSpeed ? _maxSpeed : offsetY;
 
-                RunInUIThread(dispatcherQueue, () =>
-                {
-                    _scrollViewer?.ChangeView(_scrollViewer.HorizontalOffset + offsetX, _scrollViewer.VerticalOffset + offsetY, null, true);
-                });
+                dispatcherQueue.EnqueueAsync(() => _scrollViewer?.ChangeView(_scrollViewer.HorizontalOffset + offsetX, _scrollViewer.VerticalOffset + offsetY, null, true));
             }
         }
 
@@ -326,10 +323,7 @@ private static void SetCursorType(DispatcherQueue dispatcherQueue, double offset
 
             if (_oldCursorID != cursorID)
             {
-                RunInUIThread(dispatcherQueue, () =>
-                {
-                    Window.Current.CoreWindow.PointerCursor = new CoreCursor(CoreCursorType.Custom, cursorID);
-                });
+                dispatcherQueue.EnqueueAsync(() => Window.Current.CoreWindow.PointerCursor = new CoreCursor(CoreCursorType.Custom, cursorID));
 
                 _oldCursorID = cursorID;
             }
@@ -366,10 +360,5 @@ private static bool IsCursorResourceAvailable()
 
             return isCursorAvailable;
         }
-
-        private static async void RunInUIThread(DispatcherQueue dispatcherQueue, Action action)
-        {
-            await dispatcherQueue.EnqueueAsync(action, DispatcherQueuePriority.Normal);
-        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Extensions/DispatcherQueueExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/DispatcherQueueExtensions.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
 using Windows.System;
@@ -67,7 +68,7 @@ static Task TryEnqueueAsync(DispatcherQueue dispatcher, Action function, Dispatc
                     }
                 }))
                 {
-                    taskCompletionSource.SetException(new InvalidOperationException("Failed to enqueue the operation"));
+                    taskCompletionSource.SetException(GetEnqueueException("Failed to enqueue the operation"));
                 }
 
                 return taskCompletionSource.Task;
@@ -116,7 +117,7 @@ static Task<T> TryEnqueueAsync(DispatcherQueue dispatcher, Func<T> function, Dis
                     }
                 }))
                 {
-                    taskCompletionSource.SetException(new InvalidOperationException("Failed to enqueue the operation"));
+                    taskCompletionSource.SetException(GetEnqueueException("Failed to enqueue the operation"));
                 }
 
                 return taskCompletionSource.Task;
@@ -149,7 +150,7 @@ public static Task EnqueueAsync(this DispatcherQueue dispatcher, Func<Task> func
                         return awaitableResult;
                     }
 
-                    return Task.FromException(new InvalidOperationException("The Task returned by function cannot be null."));
+                    return Task.FromException(GetEnqueueException("The Task returned by function cannot be null."));
                 }
                 catch (Exception e)
                 {
@@ -173,7 +174,7 @@ static Task TryEnqueueAsync(DispatcherQueue dispatcher, Func<Task> function, Dis
                         }
                         else
                         {
-                            taskCompletionSource.SetException(new InvalidOperationException("The Task returned by function cannot be null."));
+                            taskCompletionSource.SetException(GetEnqueueException("The Task returned by function cannot be null."));
                         }
                     }
                     catch (Exception e)
@@ -182,7 +183,7 @@ static Task TryEnqueueAsync(DispatcherQueue dispatcher, Func<Task> function, Dis
                     }
                 }))
                 {
-                    taskCompletionSource.SetException(new InvalidOperationException("Failed to enqueue the operation"));
+                    taskCompletionSource.SetException(GetEnqueueException("Failed to enqueue the operation"));
                 }
 
                 return taskCompletionSource.Task;
@@ -212,7 +213,7 @@ public static Task<T> EnqueueAsync<T>(this DispatcherQueue dispatcher, Func<Task
                         return awaitableResult;
                     }
 
-                    return Task.FromException<T>(new InvalidOperationException("The Task returned by function cannot be null."));
+                    return Task.FromException<T>(GetEnqueueException("The Task returned by function cannot be null."));
                 }
                 catch (Exception e)
                 {
@@ -236,7 +237,7 @@ static Task<T> TryEnqueueAsync(DispatcherQueue dispatcher, Func<Task<T>> functio
                         }
                         else
                         {
-                            taskCompletionSource.SetException(new InvalidOperationException("The Task returned by function cannot be null."));
+                            taskCompletionSource.SetException(GetEnqueueException("The Task returned by function cannot be null."));
                         }
                     }
                     catch (Exception e)
@@ -245,13 +246,24 @@ static Task<T> TryEnqueueAsync(DispatcherQueue dispatcher, Func<Task<T>> functio
                     }
                 }))
                 {
-                    taskCompletionSource.SetException(new InvalidOperationException("Failed to enqueue the operation"));
+                    taskCompletionSource.SetException(GetEnqueueException("Failed to enqueue the operation"));
                 }
 
                 return taskCompletionSource.Task;
             }
 
             return TryEnqueueAsync(dispatcher, function, priority);
         }
+
+        /// <summary>
+        /// Creates an <see cref="InvalidOperationException"/> to return when an enqueue operation fails.
+        /// </summary>
+        /// <param name="message">The message of the exception.</param>
+        /// <returns>An <see cref="InvalidOperationException"/> with a specified message.</returns>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static InvalidOperationException GetEnqueueException(string message)
+        {
+            return new InvalidOperationException(message);
+        }
     }
 }
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_Gaze.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_Gaze.cs
@@ -4,6 +4,7 @@
 
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -21,7 +22,7 @@ public partial class XamlIslandsTest_Gaze
         [TestInitialize]
         public async Task Init()
         {
-            await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
+            await App.Dispatcher.EnqueueAsync(() =>
             {
                 var xamlItemsPanelTemplate = @"<Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' 
                                                  xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
@@ -65,7 +66,7 @@ await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
         [TestCleanup]
         public async Task Cleanup()
         {
-            await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
+            await App.Dispatcher.EnqueueAsync(() =>
             {
                 GazeInput.SetInteraction(_grid, Interaction.Disabled);
             });
@@ -76,7 +77,7 @@ await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
         [Ignore]
         public async Task Gaze_DoesNotCrashOnIslands()
         {
-            await App.Dispatcher.ExecuteOnUIThreadAsync(async () =>
+            await App.Dispatcher.EnqueueAsync(async () =>
             {
                 await Task.Delay(10000);
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System.Linq;`
	`6`	`+using Microsoft.Toolkit.Uwp.Extensions;`
`6`	`7`	`using Microsoft.Toolkit.Uwp.Helpers;`
`7`	`8`	`using Microsoft.Toolkit.Uwp.UI.Extensions;`
`8`	`9`	`using Windows.UI.Xaml;`
`@@ -76,7 +77,7 @@ private void SearchBox_KeyDown(object sender, Windows.UI.Xaml.Input.KeyRoutedEve`
`76`	`77`	`if (e.Key == Windows.System.VirtualKey.Down && SamplePickerGrid.Visibility == Windows.UI.Xaml.Visibility.Visible)`
`77`	`78`	`{`
`78`	`79`	`// If we try and navigate down out of the textbox (and there's search results), go to the search results.`
`79`		`- DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));`
	`80`	`+ dispatcherQueue.EnqueueAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`
Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,7 @@ private static void Scroll(object state)`
`162`	`162`	`offsetX = offsetX > _maxSpeed ? _maxSpeed : offsetX;`
`163`	`163`	`offsetY = offsetY > _maxSpeed ? _maxSpeed : offsetY;`
`164`	`164`
`165`		`- RunInUIThread(dispatcherQueue, () =>`
`166`		`- {`
`167`		`- _scrollViewer?.ChangeView(_scrollViewer.HorizontalOffset + offsetX, _scrollViewer.VerticalOffset + offsetY, null, true);`
`168`		`- });`
	`165`	`+ dispatcherQueue.EnqueueAsync(() => _scrollViewer?.ChangeView(_scrollViewer.HorizontalOffset + offsetX, _scrollViewer.VerticalOffset + offsetY, null, true));`
`169`	`166`	`}`
`170`	`167`	`}`
`171`	`168`
`@@ -326,10 +323,7 @@ private static void SetCursorType(DispatcherQueue dispatcherQueue, double offset`
`326`	`323`
`327`	`324`	`if (_oldCursorID != cursorID)`
`328`	`325`	`{`
`329`		`- RunInUIThread(dispatcherQueue, () =>`
`330`		`- {`
`331`		`- Window.Current.CoreWindow.PointerCursor = new CoreCursor(CoreCursorType.Custom, cursorID);`
`332`		`- });`
	`326`	`+ dispatcherQueue.EnqueueAsync(() => Window.Current.CoreWindow.PointerCursor = new CoreCursor(CoreCursorType.Custom, cursorID));`
`333`	`327`
`334`	`328`	`_oldCursorID = cursorID;`
`335`	`329`	`}`
`@@ -366,10 +360,5 @@ private static bool IsCursorResourceAvailable()`
`366`	`360`
`367`	`361`	`return isCursorAvailable;`
`368`	`362`	`}`
`369`		`-`
`370`		`- private static async void RunInUIThread(DispatcherQueue dispatcherQueue, Action action)`
`371`		`- {`
`372`		`- await dispatcherQueue.EnqueueAsync(action, DispatcherQueuePriority.Normal);`
`373`		`- }`
`374`	`363`	`}`
`375`	`364`	`}`