diff --git a/dev/ParallaxView/TestUI/ParallaxViewStackPanelPage.xaml b/dev/ParallaxView/TestUI/ParallaxViewStackPanelPage.xaml index 0b10389104..02213537e4 100644 --- a/dev/ParallaxView/TestUI/ParallaxViewStackPanelPage.xaml +++ b/dev/ParallaxView/TestUI/ParallaxViewStackPanelPage.xaml @@ -93,9 +93,7 @@ - - + diff --git a/dev/ScrollViewer/ScrollViewer.xaml b/dev/ScrollViewer/ScrollViewer.xaml index c20377cb32..7ca093798b 100644 --- a/dev/ScrollViewer/ScrollViewer.xaml +++ b/dev/ScrollViewer/ScrollViewer.xaml @@ -12,13 +12,9 @@ - - diff --git a/dev/ScrollViewer/TestUI/ScrollViewerWithScrollControllersPage.xaml b/dev/ScrollViewer/TestUI/ScrollViewerWithScrollControllersPage.xaml index 2c35860557..772ebcfb13 100644 --- a/dev/ScrollViewer/TestUI/ScrollViewerWithScrollControllersPage.xaml +++ b/dev/ScrollViewer/TestUI/ScrollViewerWithScrollControllersPage.xaml @@ -19,13 +19,9 @@ - - diff --git a/dev/Scroller/APITests/ScrollerTests.cs b/dev/Scroller/APITests/ScrollerTests.cs index 306285db6e..5fc66fb2bb 100644 --- a/dev/Scroller/APITests/ScrollerTests.cs +++ b/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); diff --git a/dev/Scroller/Scroller.idl b/dev/Scroller/Scroller.idl index ea8b6dd229..c2e4d49e9a 100644 --- a/dev/Scroller/Scroller.idl +++ b/dev/Scroller/Scroller.idl @@ -1,5 +1,100 @@ [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 @@ -7,15 +102,15 @@ 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] diff --git a/dev/Scroller/Scroller.vcxitems b/dev/Scroller/Scroller.vcxitems index a27f94de01..930bd820f7 100644 --- a/dev/Scroller/Scroller.vcxitems +++ b/dev/Scroller/Scroller.vcxitems @@ -15,7 +15,6 @@ - diff --git a/dev/Scroller/ScrollerEnums.idl b/dev/Scroller/ScrollerEnums.idl deleted file mode 100644 index 51a1a812ab..0000000000 --- a/dev/Scroller/ScrollerEnums.idl +++ /dev/null @@ -1,94 +0,0 @@ -[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, -}; diff --git a/dev/Scroller/ScrollerPrimitives.idl b/dev/Scroller/ScrollerPrimitives.idl index 307e9d7257..8b067a580b 100644 --- a/dev/Scroller/ScrollerPrimitives.idl +++ b/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 OffsetChangeRequested; event Windows.Foundation.TypedEventHandler OffsetChangeWithAdditionalVelocityRequested; event Windows.Foundation.TypedEventHandler 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")] diff --git a/idl/Microsoft.UI.Xaml.idl b/idl/Microsoft.UI.Xaml.idl index 0bb6fe74ae..5341c7650d 100644 --- a/idl/Microsoft.UI.Xaml.idl +++ b/idl/Microsoft.UI.Xaml.idl @@ -11,8 +11,6 @@ #define USE_INSIDER_SDK #define MU_XC_NAMESPACE Windows.UI.Xaml.Controls -#define MU_SE_NAMESPACE Windows.UI.Xaml.Controls -//#define MU_SE_NAMESPACE Windows.UI.Xaml.Controls.Primitives #define MU_XCP_NAMESPACE Windows.UI.Xaml.Controls.Primitives #define MU_XM_NAMESPACE Windows.UI.Xaml.Media #define MU_XAP_NAMESPACE Windows.UI.Xaml.Automation.Peers @@ -83,7 +81,6 @@ import "Windows.UI.Composition.Interactions.idl"; #endif #define MU_XC_NAMESPACE Microsoft.UI.Xaml.Controls -#define MU_SE_NAMESPACE Microsoft.UI.Xaml.Controls #define MU_XCP_NAMESPACE Microsoft.UI.Xaml.Controls.Primitives #define MU_XM_NAMESPACE Microsoft.UI.Xaml.Media #define MU_XAP_NAMESPACE Microsoft.UI.Xaml.Automation.Peers @@ -237,11 +234,6 @@ namespace MU_X_XTI_NAMESPACE } #endif -namespace MU_SE_NAMESPACE -{ -#include -} - namespace MU_XC_NAMESPACE { #include