Check for Control.CornerRadius before loading rs5 generic.xaml (#297)

microsoft · Feb 12, 2019 · 3e43328 · 3e43328
1 parent 50aec20
commit 3e43328
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/dev/dll/SharedHelpers.cpp b/dev/dll/SharedHelpers.cpp
@@ -169,6 +169,15 @@ bool SharedHelpers::IsApplicationViewGetDisplayRegionsAvailable()
     return s_isApplicationViewGetDisplayRegionsAvailable;
 }
 
+bool SharedHelpers::IsControlCornerRadiusAvailable()
+{
+    static bool s_isControlCornerRadiusAvailable =
+        IsSystemDll() ||
+        Is19H1OrHigher() ||
+        (IsRS5OrHigher() && winrt::ApiInformation::IsPropertyPresent(L"Windows.UI.Xaml.Controls.Control", L"CornerRadius"));
+    return s_isControlCornerRadiusAvailable;
+}
+
 bool SharedHelpers::IsTranslationFacadeAvailable(const winrt::UIElement& element)
 {
     static bool s_areFacadesAvailable = (element.try_as<winrt::Windows::UI::Xaml::IUIElement9>() != nullptr);

diff --git a/dev/dll/ThemeResources.cpp b/dev/dll/ThemeResources.cpp
@@ -26,7 +26,7 @@ ThemeResources::ThemeResources()
             // RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
             bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
             bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
-            bool isRS5OrHigher = SharedHelpers::IsRS5OrHigher();
+            bool isRS5OrHigher = SharedHelpers::IsRS5OrHigher() && SharedHelpers::IsControlCornerRadiusAvailable();
             bool is19H1OrHigher = SharedHelpers::Is19H1OrHigher();
 
             bool isInFrameworkPackage = SharedHelpers::IsInFrameworkPackage();
@@ -132,7 +132,7 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
             // RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
             bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
             bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
-            bool isRS5OrHigher = SharedHelpers::IsRS5OrHigher();
+            bool isRS5OrHigher = SharedHelpers::IsRS5OrHigher() && SharedHelpers::IsControlCornerRadiusAvailable();
             bool is19H1OrHigher = SharedHelpers::Is19H1OrHigher();
 
             bool isInFrameworkPackage = SharedHelpers::IsInFrameworkPackage();
@@ -196,4 +196,4 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
         control5.DefaultStyleResourceUri(uri);
     }
 #endif
-}
+}
diff --git a/dev/inc/SharedHelpers.h b/dev/inc/SharedHelpers.h
@@ -45,6 +45,8 @@ class SharedHelpers
 
     static bool IsApplicationViewGetDisplayRegionsAvailable();
 
+    static bool IsControlCornerRadiusAvailable();
+
     static bool IsTranslationFacadeAvailable(const winrt::UIElement& element);
 
     static bool IsIconSourceElementAvailable();