Step #4: Undo addition of ScrollerEnums.idl.

dev/ParallaxView/TestUI/ParallaxViewStackPanelPage.xaml

@@ -93,9 +93,7 @@
 
         <StackPanel Grid.Column="3">
             <TextBlock Text="Parallaxing children of a StackPanel horizontally inside a Scroller" Margin="10"/>
-            <!--ifdef USE_SCROLLMODE_AUTO HorizontalScrollMode="Auto"-->
-            <muxprimitives:Scroller x:Name="scrollerH" Width="400" Height="220" Margin="10" Background="Beige"
-                VerticalAlignment="Top" HorizontalScrollMode="Enabled">
+            <muxprimitives:Scroller x:Name="scrollerH" Width="400" Height="220" Margin="10" Background="Beige" VerticalAlignment="Top">
                 <StackPanel Orientation="Horizontal">
                     <muxcontrols:ParallaxView Width="150" Height="200" Margin="10"
                         Source="{x:Bind scrollerH}" HorizontalShift="50">

dev/ScrollViewer/ScrollViewer.xaml

@@ -12,13 +12,9 @@
         <Setter Property="IsChildAvailableWidthConstrained" Value="True"/>
         <Setter Property="IsChildAvailableHeightConstrained" Value="False"/>
         <Setter Property="HorizontalScrollChainingMode" Value="Auto"/>
-        <!--ifdef USE_SCROLLMODE_AUTO
-        <Setter Property="HorizontalScrollMode" Value="Auto"/>-->
         <Setter Property="HorizontalScrollMode" Value="Enabled"/>
         <Setter Property="HorizontalScrollRailingMode" Value="Enabled"/>
         <Setter Property="VerticalScrollChainingMode" Value="Auto"/>
-        <!--ifdef USE_SCROLLMODE_AUTO
-        <Setter Property="VerticalScrollMode" Value="Auto"/>-->
         <Setter Property="VerticalScrollMode" Value="Enabled"/>
         <Setter Property="VerticalScrollRailingMode" Value="Enabled"/>
         <Setter Property="ZoomChainingMode" Value="Auto"/>

dev/ScrollViewer/TestUI/ScrollViewerWithScrollControllersPage.xaml

@@ -19,13 +19,9 @@
             <Setter Property="IsChildAvailableWidthConstrained" Value="True"/>
             <Setter Property="IsChildAvailableHeightConstrained" Value="False"/>
             <Setter Property="HorizontalScrollChainingMode" Value="Auto"/>
-            <!--ifdef USE_SCROLLMODE_AUTO
-            <Setter Property="HorizontalScrollMode" Value="Auto"/>-->
             <Setter Property="HorizontalScrollMode" Value="Enabled"/>
             <Setter Property="HorizontalScrollRailingMode" Value="Enabled"/>
             <Setter Property="VerticalScrollChainingMode" Value="Auto"/>
-            <!--ifdef USE_SCROLLMODE_AUTO
-            <Setter Property="VerticalScrollMode" Value="Auto"/>-->
             <Setter Property="VerticalScrollMode" Value="Enabled"/>
             <Setter Property="VerticalScrollRailingMode" Value="Enabled"/>
             <Setter Property="ZoomChainingMode" Value="Auto"/>

dev/Scroller/APITests/ScrollerTests.cs

@@ -151,7 +151,7 @@ public void VerifyPropertyGettersAndSetters()
                 scroller.VerticalScrollChainingMode = ChainingMode.Never;
                 scroller.HorizontalScrollRailingMode = RailingMode.Disabled;
                 scroller.VerticalScrollRailingMode = RailingMode.Disabled;
-                scroller.HorizontalScrollMode = ScrollMode.Enabled;
+                scroller.HorizontalScrollMode = ScrollMode.Disabled;
                 scroller.VerticalScrollMode = ScrollMode.Disabled;
                 scroller.ZoomChainingMode = ChainingMode.Never;
                 scroller.ZoomMode = ZoomMode.Enabled;
@@ -177,7 +177,7 @@ public void VerifyPropertyGettersAndSetters()
                 Verify.AreEqual(scroller.VerticalScrollChainingMode, ChainingMode.Never);
                 Verify.AreEqual(scroller.HorizontalScrollRailingMode, RailingMode.Disabled);
                 Verify.AreEqual(scroller.VerticalScrollRailingMode, RailingMode.Disabled);
-                Verify.AreEqual(scroller.HorizontalScrollMode, ScrollMode.Enabled);
+                Verify.AreEqual(scroller.HorizontalScrollMode, ScrollMode.Disabled);
                 Verify.AreEqual(scroller.VerticalScrollMode, ScrollMode.Disabled);
                 Verify.AreEqual(scroller.ZoomChainingMode, ChainingMode.Never);
                 Verify.AreEqual(scroller.ZoomMode, ZoomMode.Enabled);

dev/Scroller/Scroller.idl

@@ -1,21 +1,116 @@
 [WUXC_VERSION_PREVIEW]
 [webhosthidden]
+enum InteractionState
+{
+    Idle = 0,
+    Interaction = 1,
+    Inertia = 2,
+    Animation = 3,
+};
+
+#ifndef BUILD_WINDOWS
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ScrollMode
+{
+    Enabled = 0,
+    Disabled = 1,
+#ifdef USE_SCROLLMODE_AUTO
+    Auto = 2,
+#endif
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ZoomMode
+{
+    Enabled = 0,
+    Disabled = 1,
+};
+
+#endif
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ChainingMode
+{
+    Auto = 0,
+    Always = 1,
+    Never = 2,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum RailingMode
+{
+    Enabled = 0,
+    Disabled = 1,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+[flags]
+enum InputKind
+{
+    Touch = 1,
+    Pen = 2,
+    MouseWheel = 4,
+    All = 255,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ScrollerViewKind
+{
+    Absolute = 0,
+    RelativeToCurrentView = 1,
+    RelativeToEndOfInertiaView = 2,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ScrollerViewChangeKind
+{
+    DisableAnimation = 0,
+    AllowAnimation = 1,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ScrollerViewChangeSnapPointRespect
+{
+    IgnoreSnapPoints = 0,
+    RespectSnapPoints = 1,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
+enum ScrollerViewChangeResult
+{
+    Completed = 0,
+    Interrupted = 1,
+    Ignored = 2,
+};
+
+[WUXC_VERSION_PREVIEW]
+[webhosthidden]
 [marshaling_behavior(agile)]
 [threading(both)]
 runtimeclass ScrollerChangeOffsetsOptions
 {
     ScrollerChangeOffsetsOptions(
         Double horizontalOffset,
         Double verticalOffset,
-        MU_SE_NAMESPACE.ScrollerViewKind offsetsKind,
-        MU_SE_NAMESPACE.ScrollerViewChangeKind viewChangeKind,
-        MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect snapPointRespect);
+        ScrollerViewKind offsetsKind,
+        ScrollerViewChangeKind viewChangeKind,
+        ScrollerViewChangeSnapPointRespect snapPointRespect);
 
     Double HorizontalOffset { get; set; };
     Double VerticalOffset { get; set; };
-    MU_SE_NAMESPACE.ScrollerViewKind OffsetsKind { get; set; };
-    MU_SE_NAMESPACE.ScrollerViewChangeKind ViewChangeKind { get; set; };
-    MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
+    ScrollerViewKind OffsetsKind { get; set; };
+    ScrollerViewChangeKind ViewChangeKind { get; set; };
+    ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
 }
 
 [WUXC_VERSION_PREVIEW]
@@ -34,16 +129,16 @@ runtimeclass ScrollerChangeZoomFactorOptions
 {
     ScrollerChangeZoomFactorOptions(
         Single zoomFactor,
-        MU_SE_NAMESPACE.ScrollerViewKind zoomFactorKind,
+        ScrollerViewKind zoomFactorKind,
         Windows.Foundation.Numerics.Vector2 centerPoint,
-        MU_SE_NAMESPACE.ScrollerViewChangeKind viewChangeKind,
-        MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect snapPointRespect);
+        ScrollerViewChangeKind viewChangeKind,
+        ScrollerViewChangeSnapPointRespect snapPointRespect);
 
     Single ZoomFactor { get; set; };
-    MU_SE_NAMESPACE.ScrollerViewKind ZoomFactorKind { get; set; };
+    ScrollerViewKind ZoomFactorKind { get; set; };
     Windows.Foundation.Numerics.Vector2 CenterPoint { get; set; };
-    MU_SE_NAMESPACE.ScrollerViewChangeKind ViewChangeKind { get; set; };
-    MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
+    ScrollerViewChangeKind ViewChangeKind { get; set; };
+    ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
 }
 
 [WUXC_VERSION_PREVIEW]
@@ -83,7 +178,7 @@ runtimeclass ScrollerChangingZoomFactorEventArgs
 runtimeclass ScrollerViewChangeCompletedEventArgs
 {
     Int32 ViewChangeId { get; };
-    MU_SE_NAMESPACE.ScrollerViewChangeResult Result { get; };
+    ScrollerViewChangeResult Result { get; };
 }
 
 [WUXC_VERSION_PREVIEW]

dev/Scroller/Scroller.vcxitems

@@ -15,7 +15,6 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)ScrollerEnums.idl" />
     <None Include="$(MSBuildThisFileDirectory)Scroller.idl" />
     <None Include="$(MSBuildThisFileDirectory)ScrollerPrimitives.idl" />
     <None Include="$(MSBuildThisFileDirectory)ScrollerAutomationPeer.idl" />

dev/Scroller/ScrollerPrimitives.idl

@@ -58,11 +58,11 @@ unsealed runtimeclass ScrollerSnapPointRegular : ScrollerSnapPointBase
 [webhosthidden]
 runtimeclass ScrollControllerOffsetChangeRequestedEventArgs
 {
-    ScrollControllerOffsetChangeRequestedEventArgs(Double offset, MU_SE_NAMESPACE.ScrollerViewKind offsetKind, MU_SE_NAMESPACE.ScrollerViewChangeKind offsetChangeKind);
+    ScrollControllerOffsetChangeRequestedEventArgs(Double offset, MU_XC_NAMESPACE.ScrollerViewKind offsetKind, MU_XC_NAMESPACE.ScrollerViewChangeKind offsetChangeKind);
 
     Double Offset { get; };
-    MU_SE_NAMESPACE.ScrollerViewKind OffsetKind { get; };
-    MU_SE_NAMESPACE.ScrollerViewChangeKind OffsetChangeKind { get; };
+    MU_XC_NAMESPACE.ScrollerViewKind OffsetKind { get; };
+    MU_XC_NAMESPACE.ScrollerViewChangeKind OffsetChangeKind { get; };
     Int32 ViewChangeId { get; set; };
 }
 
@@ -95,11 +95,11 @@ interface IScrollController
     Boolean IsInteracting { get; };
     Windows.UI.Composition.Visual InteractionVisual { get; };
     Windows.UI.Xaml.Controls.Orientation InteractionVisualScrollOrientation { get; };
-    MU_SE_NAMESPACE.RailingMode InteractionVisualScrollRailingMode { get; };
+    MU_XC_NAMESPACE.RailingMode InteractionVisualScrollRailingMode { get; };
     void SetExpressionAnimationSources(Windows.UI.Composition.CompositionPropertySet propertySet, String minOffsetPropertyName, String maxOffsetPropertyName, String offsetPropertyName, String multiplierPropertyName);
     void SetValues(Double minOffset, Double maxOffset, Double offset, Double viewport);
     Windows.UI.Composition.CompositionAnimation GetOffsetChangeAnimation(Int32 offsetChangeId, Windows.Foundation.Numerics.Vector2 currentPosition, Windows.UI.Composition.CompositionAnimation defaultAnimation);
-    void OnOffsetChangeCompleted(Int32 offsetChangeId, MU_SE_NAMESPACE.ScrollerViewChangeResult result);
+    void OnOffsetChangeCompleted(Int32 offsetChangeId, MU_XC_NAMESPACE.ScrollerViewChangeResult result);
     event Windows.Foundation.TypedEventHandler<IScrollController, ScrollControllerOffsetChangeRequestedEventArgs> OffsetChangeRequested;
     event Windows.Foundation.TypedEventHandler<IScrollController, ScrollControllerOffsetChangeWithAdditionalVelocityRequestedEventArgs> OffsetChangeWithAdditionalVelocityRequested;
     event Windows.Foundation.TypedEventHandler<IScrollController, ScrollControllerInteractionRequestedEventArgs> InteractionRequested;
@@ -127,34 +127,34 @@ unsealed runtimeclass Scroller : Windows.UI.Xaml.FrameworkElement
     [MUX_DEFAULT_VALUE("Scroller::s_defaultIsChildAvailableHeightConstrained")]
     Boolean IsChildAvailableHeightConstrained { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultHorizontalScrollChainingMode")]
-    MU_SE_NAMESPACE.ChainingMode HorizontalScrollChainingMode { get; set; };
+    MU_XC_NAMESPACE.ChainingMode HorizontalScrollChainingMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultVerticalScrollChainingMode")]
-    MU_SE_NAMESPACE.ChainingMode VerticalScrollChainingMode { get; set; };
+    MU_XC_NAMESPACE.ChainingMode VerticalScrollChainingMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultHorizontalScrollRailingMode")]
-    MU_SE_NAMESPACE.RailingMode HorizontalScrollRailingMode { get; set; };
+    MU_XC_NAMESPACE.RailingMode HorizontalScrollRailingMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultVerticalScrollRailingMode")]
-    MU_SE_NAMESPACE.RailingMode VerticalScrollRailingMode { get; set; };
+    MU_XC_NAMESPACE.RailingMode VerticalScrollRailingMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultHorizontalScrollMode")]
-    MU_SE_NAMESPACE.ScrollMode HorizontalScrollMode { get; set; };
+    MU_XC_NAMESPACE.ScrollMode HorizontalScrollMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultVerticalScrollMode")]
-    MU_SE_NAMESPACE.ScrollMode VerticalScrollMode { get; set; };
+    MU_XC_NAMESPACE.ScrollMode VerticalScrollMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultComputedVerticalScrollMode")]
-    MU_SE_NAMESPACE.ScrollMode ComputedHorizontalScrollMode { get; };
+    MU_XC_NAMESPACE.ScrollMode ComputedHorizontalScrollMode { get; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultComputedVerticalScrollMode")]
-    MU_SE_NAMESPACE.ScrollMode ComputedVerticalScrollMode { get; };
+    MU_XC_NAMESPACE.ScrollMode ComputedVerticalScrollMode { get; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultZoomChainingMode")]
-    MU_SE_NAMESPACE.ChainingMode ZoomChainingMode { get; set; };
+    MU_XC_NAMESPACE.ChainingMode ZoomChainingMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultZoomMode")]
-    MU_SE_NAMESPACE.ZoomMode ZoomMode { get; set; };
+    MU_XC_NAMESPACE.ZoomMode ZoomMode { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultInputKind")]
-    MU_SE_NAMESPACE.InputKind InputKind { get; set; };
+    MU_XC_NAMESPACE.InputKind InputKind { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultMinZoomFactor")]
     [MUX_PROPERTY_VALIDATION_CALLBACK("ValidateZoomFactoryBoundary")]
     Double MinZoomFactor { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultMaxZoomFactor")]
     [MUX_PROPERTY_VALIDATION_CALLBACK("ValidateZoomFactoryBoundary")]
     Double MaxZoomFactor { get; set; };
-    MU_SE_NAMESPACE.InteractionState State { get; };
+    MU_XC_NAMESPACE.InteractionState State { get; };
     IScrollController HorizontalScrollController { get; set; };
     IScrollController VerticalScrollController { get; set; };
     [MUX_DEFAULT_VALUE("Scroller::s_defaultAnchorAtExtent")]