ScrollViewer supports UISettings' AutoHideScrollBars property (#731)

* ScrollViewer control: Support non-auto-hiding ScrollBars on RS4+. * Scroller control: Fixing typo in when calling RaiseViewportChanged. * Applying some PR feedback. * Applying PR feedback. * Addressing CR feedback and adding Windows SDK installation options so MinCore.lib is found on the build machines. * Replacing test class ScrollViewerWithVisualStateCounts with ScrollViewerVisualStateCounts. * Skipping VerifyVisualStates test when system animations are turned off. * Fixing missed calls to ScrollBarController::HookScrollBarPropertyChanged/UnhookScrollBarPropertyChanged in debug builds. * Fixing debug output of GoToState's state name. * Moving ScrollViewer common resources out of ResourceDictionary.ThemeDictionaries.
microsoft · Jun 7, 2019 · 0eb29e6 · 0eb29e6
1 parent 9f7deae
commit 0eb29e6
Show file tree

Hide file tree

Showing 26 changed files with 1,133 additions and 291 deletions.
diff --git a/build/Install-WindowsSdkISO.ps1 b/build/Install-WindowsSdkISO.ps1
@@ -6,7 +6,7 @@ param([Parameter(Mandatory=$true, Position=0)]
 $ErrorActionPreference = 'Stop'
 
 # Constants
-$WindowsSDKOptions = @("OptionId.UWPCpp")
+$WindowsSDKOptions = @("OptionId.UWPCpp", "OptionId.DesktopCPPx64", "OptionId.DesktopCPPx86", "OptionId.DesktopCPPARM64", "OptionId.DesktopCPPARM")
 $WindowsSDKRegPath = "HKLM:\Software\Microsoft\Windows Kits\Installed Roots"
 $WindowsSDKRegRootKey = "KitsRoot10"
 $WindowsSDKVersion = "10.0.$buildNumber.0"

diff --git a/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp b/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
@@ -31,7 +31,7 @@ CommandBarFlyoutCommandBar::CommandBarFlyoutCommandBar()
 
                 if (firstCommandAsFrameworkElement)
                 {
-                    if (IsFrameworkElementLoaded(firstCommandAsFrameworkElement))
+                    if (SharedHelpers::IsFrameworkElementLoaded(firstCommandAsFrameworkElement))
                     {
                         FocusCommand(
                             commands,
@@ -926,19 +926,6 @@ void CommandBarFlyoutCommandBar::OnKeyDown(
     __super::OnKeyDown(args);
 }
 
-bool CommandBarFlyoutCommandBar::IsFrameworkElementLoaded(
-    winrt::FrameworkElement const& frameworkElement)
-{
-    if (SharedHelpers::IsRS5OrHigher())
-    {
-        return frameworkElement.IsLoaded();
-    }
-    else
-    {
-        return winrt::VisualTreeHelper::GetParent(frameworkElement) != nullptr;
-    }
-}
-
 bool CommandBarFlyoutCommandBar::IsControlFocusable(
     winrt::Control const& control,
     bool checkTabStop)

diff --git a/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h b/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
@@ -40,8 +40,6 @@ class CommandBarFlyoutCommandBar :
     void EnsureAutomationSetCountAndPosition();
     void EnsureFocusedPrimaryCommand();
 
-    static bool IsFrameworkElementLoaded(
-        winrt::FrameworkElement const& frameworkElement);
     static bool IsControlFocusable(
         winrt::Control const& control,
         bool checkTabStop);

diff --git a/dev/ScrollViewer/APITests/ScrollViewerTests.cs b/dev/ScrollViewer/APITests/ScrollViewerTests.cs
diff --git a/dev/ScrollViewer/ScrollBarController.cpp b/dev/ScrollViewer/ScrollBarController.cpp
@@ -22,9 +22,7 @@ ScrollBarController::~ScrollBarController()
     SCROLLVIEWER_TRACE_INFO(nullptr, TRACE_MSG_METH, METH_NAME, this);
 
     UnhookScrollBarEvent();
-#ifdef _DEBUG
     UnhookScrollBarPropertyChanged();
-#endif //_DEBUG
 }
 
 void ScrollBarController::SetScrollBar(const winrt::ScrollBar& scrollBar)
@@ -36,9 +34,7 @@ void ScrollBarController::SetScrollBar(const winrt::ScrollBar& scrollBar)
     m_scrollBar = scrollBar;
 
     HookScrollBarEvent();
-#ifdef _DEBUG
     HookScrollBarPropertyChanged();
-#endif //_DEBUG
 }
 
 #pragma region IScrollController