Merged PR 166: Update to WinUI 2.4

microsoft · Jun 17, 2020 · 432c6d4 · 432c6d4
1 parent 34deef2
commit 432c6d4
Show file tree

Hide file tree

Showing 5 changed files with 247 additions and 291 deletions.
diff --git a/PhotoLab/App.xaml b/PhotoLab/App.xaml
@@ -27,9 +27,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Application.Resources>
-        <!--  window width adaptive snap points  -->
-        <x:Double x:Key="MinWindowSnapPoint">0</x:Double>
-        <x:Double x:Key="MediumWindowSnapPoint">641</x:Double>
-        <x:Double x:Key="LargeWindowSnapPoint">1008</x:Double>
+        <ResourceDictionary>
+            <!--  window width adaptive snap points  -->
+            <x:Double x:Key="MinWindowSnapPoint">0</x:Double>
+            <x:Double x:Key="MediumWindowSnapPoint">641</x:Double>
+            <x:Double x:Key="LargeWindowSnapPoint">1008</x:Double>
+            <SolidColorBrush x:Key="RatingControlSelectedForeground" Color="White"/>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
+        </ResourceDictionary>
     </Application.Resources>
 </Application>