Skip to content

Commit 59e073d

Browse files
RBridRBrid
committed
Step #4: Undo addition of ScrollerEnums.idl.
1 parent 03bcbbc commit 59e073d

9 files changed

+128
-146
lines changed

‎dev/ParallaxView/TestUI/ParallaxViewStackPanelPage.xaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@
9393

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

‎dev/ScrollViewer/ScrollViewer.xaml

-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
<Setter Property="IsChildAvailableWidthConstrained" Value="True"/>
1313
<Setter Property="IsChildAvailableHeightConstrained" Value="False"/>
1414
<Setter Property="HorizontalScrollChainingMode" Value="Auto"/>
15-
<!--ifdef USE_SCROLLMODE_AUTO
16-
<Setter Property="HorizontalScrollMode" Value="Auto"/>-->
1715
<Setter Property="HorizontalScrollMode" Value="Enabled"/>
1816
<Setter Property="HorizontalScrollRailingMode" Value="Enabled"/>
1917
<Setter Property="VerticalScrollChainingMode" Value="Auto"/>
20-
<!--ifdef USE_SCROLLMODE_AUTO
21-
<Setter Property="VerticalScrollMode" Value="Auto"/>-->
2218
<Setter Property="VerticalScrollMode" Value="Enabled"/>
2319
<Setter Property="VerticalScrollRailingMode" Value="Enabled"/>
2420
<Setter Property="ZoomChainingMode" Value="Auto"/>

‎dev/ScrollViewer/TestUI/ScrollViewerWithScrollControllersPage.xaml

-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@
1919
<Setter Property="IsChildAvailableWidthConstrained" Value="True"/>
2020
<Setter Property="IsChildAvailableHeightConstrained" Value="False"/>
2121
<Setter Property="HorizontalScrollChainingMode" Value="Auto"/>
22-
<!--ifdef USE_SCROLLMODE_AUTO
23-
<Setter Property="HorizontalScrollMode" Value="Auto"/>-->
2422
<Setter Property="HorizontalScrollMode" Value="Enabled"/>
2523
<Setter Property="HorizontalScrollRailingMode" Value="Enabled"/>
2624
<Setter Property="VerticalScrollChainingMode" Value="Auto"/>
27-
<!--ifdef USE_SCROLLMODE_AUTO
28-
<Setter Property="VerticalScrollMode" Value="Auto"/>-->
2925
<Setter Property="VerticalScrollMode" Value="Enabled"/>
3026
<Setter Property="VerticalScrollRailingMode" Value="Enabled"/>
3127
<Setter Property="ZoomChainingMode" Value="Auto"/>

‎dev/Scroller/APITests/ScrollerTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void VerifyPropertyGettersAndSetters()
151151
scroller.VerticalScrollChainingMode = ChainingMode.Never;
152152
scroller.HorizontalScrollRailingMode = RailingMode.Disabled;
153153
scroller.VerticalScrollRailingMode = RailingMode.Disabled;
154-
scroller.HorizontalScrollMode = ScrollMode.Enabled;
154+
scroller.HorizontalScrollMode = ScrollMode.Disabled;
155155
scroller.VerticalScrollMode = ScrollMode.Disabled;
156156
scroller.ZoomChainingMode = ChainingMode.Never;
157157
scroller.ZoomMode = ZoomMode.Enabled;
@@ -177,7 +177,7 @@ public void VerifyPropertyGettersAndSetters()
177177
Verify.AreEqual(scroller.VerticalScrollChainingMode, ChainingMode.Never);
178178
Verify.AreEqual(scroller.HorizontalScrollRailingMode, RailingMode.Disabled);
179179
Verify.AreEqual(scroller.VerticalScrollRailingMode, RailingMode.Disabled);
180-
Verify.AreEqual(scroller.HorizontalScrollMode, ScrollMode.Enabled);
180+
Verify.AreEqual(scroller.HorizontalScrollMode, ScrollMode.Disabled);
181181
Verify.AreEqual(scroller.VerticalScrollMode, ScrollMode.Disabled);
182182
Verify.AreEqual(scroller.ZoomChainingMode, ChainingMode.Never);
183183
Verify.AreEqual(scroller.ZoomMode, ZoomMode.Enabled);

‎dev/Scroller/Scroller.idl

+108-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,116 @@
11
[WUXC_VERSION_PREVIEW]
22
[webhosthidden]
3+
enum InteractionState
4+
{
5+
Idle = 0,
6+
Interaction = 1,
7+
Inertia = 2,
8+
Animation = 3,
9+
};
10+
11+
#ifndef BUILD_WINDOWS
12+
13+
[WUXC_VERSION_PREVIEW]
14+
[webhosthidden]
15+
enum ScrollMode
16+
{
17+
Enabled = 0,
18+
Disabled = 1,
19+
#ifdef USE_SCROLLMODE_AUTO
20+
Auto = 2,
21+
#endif
22+
};
23+
24+
[WUXC_VERSION_PREVIEW]
25+
[webhosthidden]
26+
enum ZoomMode
27+
{
28+
Enabled = 0,
29+
Disabled = 1,
30+
};
31+
32+
#endif
33+
34+
[WUXC_VERSION_PREVIEW]
35+
[webhosthidden]
36+
enum ChainingMode
37+
{
38+
Auto = 0,
39+
Always = 1,
40+
Never = 2,
41+
};
42+
43+
[WUXC_VERSION_PREVIEW]
44+
[webhosthidden]
45+
enum RailingMode
46+
{
47+
Enabled = 0,
48+
Disabled = 1,
49+
};
50+
51+
[WUXC_VERSION_PREVIEW]
52+
[webhosthidden]
53+
[flags]
54+
enum InputKind
55+
{
56+
Touch = 1,
57+
Pen = 2,
58+
MouseWheel = 4,
59+
All = 255,
60+
};
61+
62+
[WUXC_VERSION_PREVIEW]
63+
[webhosthidden]
64+
enum ScrollerViewKind
65+
{
66+
Absolute = 0,
67+
RelativeToCurrentView = 1,
68+
RelativeToEndOfInertiaView = 2,
69+
};
70+
71+
[WUXC_VERSION_PREVIEW]
72+
[webhosthidden]
73+
enum ScrollerViewChangeKind
74+
{
75+
DisableAnimation = 0,
76+
AllowAnimation = 1,
77+
};
78+
79+
[WUXC_VERSION_PREVIEW]
80+
[webhosthidden]
81+
enum ScrollerViewChangeSnapPointRespect
82+
{
83+
IgnoreSnapPoints = 0,
84+
RespectSnapPoints = 1,
85+
};
86+
87+
[WUXC_VERSION_PREVIEW]
88+
[webhosthidden]
89+
enum ScrollerViewChangeResult
90+
{
91+
Completed = 0,
92+
Interrupted = 1,
93+
Ignored = 2,
94+
};
95+
96+
[WUXC_VERSION_PREVIEW]
97+
[webhosthidden]
398
[marshaling_behavior(agile)]
499
[threading(both)]
5100
runtimeclass ScrollerChangeOffsetsOptions
6101
{
7102
ScrollerChangeOffsetsOptions(
8103
Double horizontalOffset,
9104
Double verticalOffset,
10-
MU_SE_NAMESPACE.ScrollerViewKind offsetsKind,
11-
MU_SE_NAMESPACE.ScrollerViewChangeKind viewChangeKind,
12-
MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect snapPointRespect);
105+
ScrollerViewKind offsetsKind,
106+
ScrollerViewChangeKind viewChangeKind,
107+
ScrollerViewChangeSnapPointRespect snapPointRespect);
13108

14109
Double HorizontalOffset { get; set; };
15110
Double VerticalOffset { get; set; };
16-
MU_SE_NAMESPACE.ScrollerViewKind OffsetsKind { get; set; };
17-
MU_SE_NAMESPACE.ScrollerViewChangeKind ViewChangeKind { get; set; };
18-
MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
111+
ScrollerViewKind OffsetsKind { get; set; };
112+
ScrollerViewChangeKind ViewChangeKind { get; set; };
113+
ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
19114
}
20115

21116
[WUXC_VERSION_PREVIEW]
@@ -34,16 +129,16 @@ runtimeclass ScrollerChangeZoomFactorOptions
34129
{
35130
ScrollerChangeZoomFactorOptions(
36131
Single zoomFactor,
37-
MU_SE_NAMESPACE.ScrollerViewKind zoomFactorKind,
132+
ScrollerViewKind zoomFactorKind,
38133
Windows.Foundation.Numerics.Vector2 centerPoint,
39-
MU_SE_NAMESPACE.ScrollerViewChangeKind viewChangeKind,
40-
MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect snapPointRespect);
134+
ScrollerViewChangeKind viewChangeKind,
135+
ScrollerViewChangeSnapPointRespect snapPointRespect);
41136

42137
Single ZoomFactor { get; set; };
43-
MU_SE_NAMESPACE.ScrollerViewKind ZoomFactorKind { get; set; };
138+
ScrollerViewKind ZoomFactorKind { get; set; };
44139
Windows.Foundation.Numerics.Vector2 CenterPoint { get; set; };
45-
MU_SE_NAMESPACE.ScrollerViewChangeKind ViewChangeKind { get; set; };
46-
MU_SE_NAMESPACE.ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
140+
ScrollerViewChangeKind ViewChangeKind { get; set; };
141+
ScrollerViewChangeSnapPointRespect SnapPointRespect{ get; set; };
47142
}
48143

49144
[WUXC_VERSION_PREVIEW]
@@ -83,7 +178,7 @@ runtimeclass ScrollerChangingZoomFactorEventArgs
83178
runtimeclass ScrollerViewChangeCompletedEventArgs
84179
{
85180
Int32 ViewChangeId { get; };
86-
MU_SE_NAMESPACE.ScrollerViewChangeResult Result { get; };
181+
ScrollerViewChangeResult Result { get; };
87182
}
88183

89184
[WUXC_VERSION_PREVIEW]

‎dev/Scroller/Scroller.vcxitems

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<ProjectCapability Include="SourceItemsFromImports" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<None Include="$(MSBuildThisFileDirectory)ScrollerEnums.idl" />
1918
<None Include="$(MSBuildThisFileDirectory)Scroller.idl" />
2019
<None Include="$(MSBuildThisFileDirectory)ScrollerPrimitives.idl" />
2120
<None Include="$(MSBuildThisFileDirectory)ScrollerAutomationPeer.idl" />

‎dev/Scroller/ScrollerEnums.idl

-94
This file was deleted.

‎dev/Scroller/ScrollerPrimitives.idl

+17-17
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ unsealed runtimeclass ScrollerSnapPointRegular : ScrollerSnapPointBase
5858
[webhosthidden]
5959
runtimeclass ScrollControllerOffsetChangeRequestedEventArgs
6060
{
61-
ScrollControllerOffsetChangeRequestedEventArgs(Double offset, MU_SE_NAMESPACE.ScrollerViewKind offsetKind, MU_SE_NAMESPACE.ScrollerViewChangeKind offsetChangeKind);
61+
ScrollControllerOffsetChangeRequestedEventArgs(Double offset, MU_XC_NAMESPACE.ScrollerViewKind offsetKind, MU_XC_NAMESPACE.ScrollerViewChangeKind offsetChangeKind);
6262

6363
Double Offset { get; };
64-
MU_SE_NAMESPACE.ScrollerViewKind OffsetKind { get; };
65-
MU_SE_NAMESPACE.ScrollerViewChangeKind OffsetChangeKind { get; };
64+
MU_XC_NAMESPACE.ScrollerViewKind OffsetKind { get; };
65+
MU_XC_NAMESPACE.ScrollerViewChangeKind OffsetChangeKind { get; };
6666
Int32 ViewChangeId { get; set; };
6767
}
6868

@@ -95,11 +95,11 @@ interface IScrollController
9595
Boolean IsInteracting { get; };
9696
Windows.UI.Composition.Visual InteractionVisual { get; };
9797
Windows.UI.Xaml.Controls.Orientation InteractionVisualScrollOrientation { get; };
98-
MU_SE_NAMESPACE.RailingMode InteractionVisualScrollRailingMode { get; };
98+
MU_XC_NAMESPACE.RailingMode InteractionVisualScrollRailingMode { get; };
9999
void SetExpressionAnimationSources(Windows.UI.Composition.CompositionPropertySet propertySet, String minOffsetPropertyName, String maxOffsetPropertyName, String offsetPropertyName, String multiplierPropertyName);
100100
void SetValues(Double minOffset, Double maxOffset, Double offset, Double viewport);
101101
Windows.UI.Composition.CompositionAnimation GetOffsetChangeAnimation(Int32 offsetChangeId, Windows.Foundation.Numerics.Vector2 currentPosition, Windows.UI.Composition.CompositionAnimation defaultAnimation);
102-
void OnOffsetChangeCompleted(Int32 offsetChangeId, MU_SE_NAMESPACE.ScrollerViewChangeResult result);
102+
void OnOffsetChangeCompleted(Int32 offsetChangeId, MU_XC_NAMESPACE.ScrollerViewChangeResult result);
103103
event Windows.Foundation.TypedEventHandler<IScrollController, ScrollControllerOffsetChangeRequestedEventArgs> OffsetChangeRequested;
104104
event Windows.Foundation.TypedEventHandler<IScrollController, ScrollControllerOffsetChangeWithAdditionalVelocityRequestedEventArgs> OffsetChangeWithAdditionalVelocityRequested;
105105
event Windows.Foundation.TypedEventHandler<IScrollController, ScrollControllerInteractionRequestedEventArgs> InteractionRequested;
@@ -127,34 +127,34 @@ unsealed runtimeclass Scroller : Windows.UI.Xaml.FrameworkElement
127127
[MUX_DEFAULT_VALUE("Scroller::s_defaultIsChildAvailableHeightConstrained")]
128128
Boolean IsChildAvailableHeightConstrained { get; set; };
129129
[MUX_DEFAULT_VALUE("Scroller::s_defaultHorizontalScrollChainingMode")]
130-
MU_SE_NAMESPACE.ChainingMode HorizontalScrollChainingMode { get; set; };
130+
MU_XC_NAMESPACE.ChainingMode HorizontalScrollChainingMode { get; set; };
131131
[MUX_DEFAULT_VALUE("Scroller::s_defaultVerticalScrollChainingMode")]
132-
MU_SE_NAMESPACE.ChainingMode VerticalScrollChainingMode { get; set; };
132+
MU_XC_NAMESPACE.ChainingMode VerticalScrollChainingMode { get; set; };
133133
[MUX_DEFAULT_VALUE("Scroller::s_defaultHorizontalScrollRailingMode")]
134-
MU_SE_NAMESPACE.RailingMode HorizontalScrollRailingMode { get; set; };
134+
MU_XC_NAMESPACE.RailingMode HorizontalScrollRailingMode { get; set; };
135135
[MUX_DEFAULT_VALUE("Scroller::s_defaultVerticalScrollRailingMode")]
136-
MU_SE_NAMESPACE.RailingMode VerticalScrollRailingMode { get; set; };
136+
MU_XC_NAMESPACE.RailingMode VerticalScrollRailingMode { get; set; };
137137
[MUX_DEFAULT_VALUE("Scroller::s_defaultHorizontalScrollMode")]
138-
MU_SE_NAMESPACE.ScrollMode HorizontalScrollMode { get; set; };
138+
MU_XC_NAMESPACE.ScrollMode HorizontalScrollMode { get; set; };
139139
[MUX_DEFAULT_VALUE("Scroller::s_defaultVerticalScrollMode")]
140-
MU_SE_NAMESPACE.ScrollMode VerticalScrollMode { get; set; };
140+
MU_XC_NAMESPACE.ScrollMode VerticalScrollMode { get; set; };
141141
[MUX_DEFAULT_VALUE("Scroller::s_defaultComputedVerticalScrollMode")]
142-
MU_SE_NAMESPACE.ScrollMode ComputedHorizontalScrollMode { get; };
142+
MU_XC_NAMESPACE.ScrollMode ComputedHorizontalScrollMode { get; };
143143
[MUX_DEFAULT_VALUE("Scroller::s_defaultComputedVerticalScrollMode")]
144-
MU_SE_NAMESPACE.ScrollMode ComputedVerticalScrollMode { get; };
144+
MU_XC_NAMESPACE.ScrollMode ComputedVerticalScrollMode { get; };
145145
[MUX_DEFAULT_VALUE("Scroller::s_defaultZoomChainingMode")]
146-
MU_SE_NAMESPACE.ChainingMode ZoomChainingMode { get; set; };
146+
MU_XC_NAMESPACE.ChainingMode ZoomChainingMode { get; set; };
147147
[MUX_DEFAULT_VALUE("Scroller::s_defaultZoomMode")]
148-
MU_SE_NAMESPACE.ZoomMode ZoomMode { get; set; };
148+
MU_XC_NAMESPACE.ZoomMode ZoomMode { get; set; };
149149
[MUX_DEFAULT_VALUE("Scroller::s_defaultInputKind")]
150-
MU_SE_NAMESPACE.InputKind InputKind { get; set; };
150+
MU_XC_NAMESPACE.InputKind InputKind { get; set; };
151151
[MUX_DEFAULT_VALUE("Scroller::s_defaultMinZoomFactor")]
152152
[MUX_PROPERTY_VALIDATION_CALLBACK("ValidateZoomFactoryBoundary")]
153153
Double MinZoomFactor { get; set; };
154154
[MUX_DEFAULT_VALUE("Scroller::s_defaultMaxZoomFactor")]
155155
[MUX_PROPERTY_VALIDATION_CALLBACK("ValidateZoomFactoryBoundary")]
156156
Double MaxZoomFactor { get; set; };
157-
MU_SE_NAMESPACE.InteractionState State { get; };
157+
MU_XC_NAMESPACE.InteractionState State { get; };
158158
IScrollController HorizontalScrollController { get; set; };
159159
IScrollController VerticalScrollController { get; set; };
160160
[MUX_DEFAULT_VALUE("Scroller::s_defaultAnchorAtExtent")]

0 commit comments

Comments
 (0)