diff --git a/dev/Scroller/Scroller.idl b/dev/Scroller/Scroller.idl index 7af251d55d..e68da9d70e 100644 --- a/dev/Scroller/Scroller.idl +++ b/dev/Scroller/Scroller.idl @@ -1,96 +1,5 @@ [WUXC_VERSION_PREVIEW] [webhosthidden] -enum InteractionState -{ - Idle = 0, - Interaction = 1, - Inertia = 2, - Animation = 3, -}; - -[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, -}; - -[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 diff --git a/dev/Scroller/Scroller.vcxitems b/dev/Scroller/Scroller.vcxitems index 930bd820f7..a27f94de01 100644 --- a/dev/Scroller/Scroller.vcxitems +++ b/dev/Scroller/Scroller.vcxitems @@ -15,6 +15,7 @@ + diff --git a/dev/Scroller/ScrollerEnums.idl b/dev/Scroller/ScrollerEnums.idl index 88d78c0de6..45ad0b164e 100644 --- a/dev/Scroller/ScrollerEnums.idl +++ b/dev/Scroller/ScrollerEnums.idl @@ -1,11 +1,11 @@ [WUXC_VERSION_PREVIEW] [webhosthidden] -enum ScrollerState +enum InteractionState { Idle = 0, - Interacting = 1, + Interaction = 1, Inertia = 2, - CustomAnimation = 3, + Animation = 3, }; [WUXC_VERSION_PREVIEW] diff --git a/idl/Microsoft.UI.Xaml.idl b/idl/Microsoft.UI.Xaml.idl index 769e0a0dc3..533ebaefdb 100644 --- a/idl/Microsoft.UI.Xaml.idl +++ b/idl/Microsoft.UI.Xaml.idl @@ -11,6 +11,7 @@ #define USE_INSIDER_SDK #define MU_XC_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 @@ -81,6 +82,7 @@ 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 @@ -234,6 +236,10 @@ namespace MU_X_XTI_NAMESPACE } #endif +namespace MU_SE_NAMESPACE +{ +#include +} namespace MU_XC_NAMESPACE {