From 069d291452b7341b411ae56728a413499176a792 Mon Sep 17 00:00:00 2001 From: Jevan Saks Date: Sun, 27 Jun 2021 03:14:21 -0700 Subject: [PATCH] AcrylicBrushes are not getting luminosity values set (#5297) --- dev/dll/XamlControlsResources.cpp | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dev/dll/XamlControlsResources.cpp b/dev/dll/XamlControlsResources.cpp index a0cfd88c05..9393e45712 100644 --- a/dev/dll/XamlControlsResources.cpp +++ b/dev/dll/XamlControlsResources.cpp @@ -163,43 +163,43 @@ void XamlControlsResources::UpdateSource() void XamlControlsResources::UpdateAcrylicBrushesLightTheme(const winrt::IInspectable themeDictionary) { const auto dictionary = themeDictionary.try_as(); - if (const auto acrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultBrush)).try_as()) + if (const auto acrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultBrush)).as()) { acrylicBackgroundFillColorDefaultBrush.TintLuminosityOpacity(0.85); } - if (const auto acrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultBrush)).try_as()) + if (const auto acrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultBrush)).as()) { acrylicInAppFillColorDefaultBrush.TintLuminosityOpacity(0.85); } - if (const auto acrylicBackgroundFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultInverseBrush)).try_as()) + if (const auto acrylicBackgroundFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultInverseBrush)).as()) { acrylicBackgroundFillColorDefaultInverseBrush.TintLuminosityOpacity(0.96); } - if (const auto acrylicInAppFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultInverseBrush)).try_as()) + if (const auto acrylicInAppFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultInverseBrush)).as()) { acrylicInAppFillColorDefaultInverseBrush.TintLuminosityOpacity(0.96); } - if (const auto acrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorBaseBrush)).try_as()) + if (const auto acrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorBaseBrush)).as()) { acrylicBackgroundFillColorBaseBrush.TintLuminosityOpacity(0.9); } - if (const auto acrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorBaseBrush)).try_as()) + if (const auto acrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorBaseBrush)).as()) { acrylicInAppFillColorBaseBrush.TintLuminosityOpacity(0.9); } - if (const auto accentAcrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorDefaultBrush)).try_as()) + if (const auto accentAcrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorDefaultBrush)).as()) { accentAcrylicBackgroundFillColorDefaultBrush.TintLuminosityOpacity(0.9); } - if (const auto accentAcrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorDefaultBrush)).try_as()) + if (const auto accentAcrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorDefaultBrush)).as()) { accentAcrylicInAppFillColorDefaultBrush.TintLuminosityOpacity(0.9); } - if (const auto accentAcrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorBaseBrush)).try_as()) + if (const auto accentAcrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorBaseBrush)).as()) { accentAcrylicBackgroundFillColorBaseBrush.TintLuminosityOpacity(0.9); } - if (const auto accentAcrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorBaseBrush)).try_as()) + if (const auto accentAcrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorBaseBrush)).as()) { accentAcrylicInAppFillColorBaseBrush.TintLuminosityOpacity(0.9); } @@ -209,43 +209,43 @@ void XamlControlsResources::UpdateAcrylicBrushesDarkTheme(const winrt::IInspecta { if (const auto dictionary = themeDictionary.try_as()) { - if (const auto acrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultBrush)).try_as()) + if (const auto acrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultBrush)).as()) { acrylicBackgroundFillColorDefaultBrush.TintLuminosityOpacity(0.96); } - if (const auto acrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultBrush)).try_as()) + if (const auto acrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultBrush)).as()) { acrylicInAppFillColorDefaultBrush.TintLuminosityOpacity(0.96); } - if (const auto acrylicBackgroundFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultInverseBrush)).try_as()) + if (const auto acrylicBackgroundFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorDefaultInverseBrush)).as()) { acrylicBackgroundFillColorDefaultInverseBrush.TintLuminosityOpacity(0.85); } - if (const auto acrylicInAppFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultInverseBrush)).try_as()) + if (const auto acrylicInAppFillColorDefaultInverseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorDefaultInverseBrush)).as()) { acrylicInAppFillColorDefaultInverseBrush.TintLuminosityOpacity(0.85); } - if (const auto acrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorBaseBrush)).try_as()) + if (const auto acrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicBackgroundFillColorBaseBrush)).as()) { acrylicBackgroundFillColorBaseBrush.TintLuminosityOpacity(0.96); } - if (const auto acrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorBaseBrush)).try_as()) + if (const auto acrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AcrylicInAppFillColorBaseBrush)).as()) { acrylicInAppFillColorBaseBrush.TintLuminosityOpacity(0.96); } - if (const auto accentAcrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorDefaultBrush)).try_as()) + if (const auto accentAcrylicBackgroundFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorDefaultBrush)).as()) { accentAcrylicBackgroundFillColorDefaultBrush.TintLuminosityOpacity(0.8); } - if (const auto accentAcrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorDefaultBrush)).try_as()) + if (const auto accentAcrylicInAppFillColorDefaultBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorDefaultBrush)).as()) { accentAcrylicInAppFillColorDefaultBrush.TintLuminosityOpacity(0.8); } - if (const auto accentAcrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorBaseBrush)).try_as()) + if (const auto accentAcrylicBackgroundFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicBackgroundFillColorBaseBrush)).as()) { accentAcrylicBackgroundFillColorBaseBrush.TintLuminosityOpacity(0.8); } - if (const auto accentAcrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorBaseBrush)).try_as()) + if (const auto accentAcrylicInAppFillColorBaseBrush = dictionary.Lookup(box_value(c_AccentAcrylicInAppFillColorBaseBrush)).as()) { accentAcrylicInAppFillColorBaseBrush.TintLuminosityOpacity(0.8); }