react-native-windows 0.74.0-preview.3 → 0.74.0-preview.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Microsoft.ReactNative/CompositionComponentView.idl +18 -3
- package/Microsoft.ReactNative/CompositionContext.idl +5 -5
- package/Microsoft.ReactNative/CompositionRootView.idl +22 -8
- package/Microsoft.ReactNative/CompositionSwitcher.idl +2 -2
- package/Microsoft.ReactNative/CompositionUIService.idl +8 -6
- package/Microsoft.ReactNative/Fabric/AbiViewProps.cpp +8 -1
- package/Microsoft.ReactNative/Fabric/AbiViewProps.h +7 -2
- package/Microsoft.ReactNative/Fabric/Composition/ActivityIndicatorComponentView.cpp +4 -3
- package/Microsoft.ReactNative/Fabric/Composition/ActivityIndicatorComponentView.h +5 -5
- package/Microsoft.ReactNative/Fabric/Composition/ComponentViewRegistry.cpp +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/ComponentViewRegistry.h +2 -1
- package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp +173 -152
- package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.h +8 -8
- package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper_emptyimpl.cpp +13 -13
- package/Microsoft.ReactNative/Fabric/Composition/CompositionHelpers.h +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/CompositionHwndHost.cpp +14 -11
- package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.cpp +24 -11
- package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.h +15 -10
- package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView_emptyimpl.cpp +15 -4
- package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService.cpp +20 -9
- package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService.h +6 -4
- package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService_emptyimpl.cpp +5 -2
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp +104 -54
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h +25 -19
- package/Microsoft.ReactNative/Fabric/Composition/DebuggingOverlayComponentView.cpp +2 -2
- package/Microsoft.ReactNative/Fabric/Composition/DebuggingOverlayComponentView.h +2 -2
- package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.cpp +9 -8
- package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.h +5 -5
- package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp +7 -5
- package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.h +5 -5
- package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.cpp +4 -4
- package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.h +5 -5
- package/Microsoft.ReactNative/Fabric/Composition/ReactCompositionViewComponentBuilder.cpp +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/ReactCompositionViewComponentBuilder.h +5 -2
- package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp +2 -2
- package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.h +2 -2
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +34 -27
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.h +6 -6
- package/Microsoft.ReactNative/Fabric/Composition/SwitchComponentView.cpp +9 -9
- package/Microsoft.ReactNative/Fabric/Composition/SwitchComponentView.h +6 -6
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +5 -4
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h +6 -6
- package/Microsoft.ReactNative/Fabric/Composition/Theme.cpp +13 -3
- package/Microsoft.ReactNative/Fabric/Composition/Theme.h +16 -8
- package/Microsoft.ReactNative/Fabric/Composition/Theme_emptyimpl.cpp +3 -3
- package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.cpp +3 -3
- package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.h +3 -3
- package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h +1 -1
- package/Microsoft.ReactNative/Fabric/IComponentViewRegistry.h +1 -1
- package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp +2 -1
- package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp +7 -5
- package/Microsoft.ReactNative/Theme.idl +12 -1
- package/Microsoft.ReactNative/ViewProps.idl +11 -1
- package/Microsoft.ReactNative/packages.lock.json +70 -42
- package/Microsoft.ReactNative.Cxx/AutoDraw.h +3 -3
- package/Microsoft.ReactNative.Cxx/{CompositionSwitcher.interop.h → CompositionSwitcher.Experimental.interop.h} +2 -2
- package/Microsoft.ReactNative.Cxx/DesktopWindowBridge.h +2 -0
- package/Microsoft.ReactNative.Managed/Microsoft.ReactNative.Managed.csproj +2 -11
- package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.props +1 -1
- package/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +5 -3
- package/PropertySheets/Generated/PackageVersion.g.props +2 -2
- package/package.json +1 -1
- package/templates/cpp-app/windows/MyApp/MyApp.cpp +2 -7
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
|
|
2
2
|
#include "pch.h"
|
|
3
3
|
#include "CompositionContextHelper.h"
|
|
4
|
-
#if __has_include("Composition.SystemCompositionContextHelper.g.cpp")
|
|
5
|
-
#include "Composition.SystemCompositionContextHelper.g.cpp"
|
|
4
|
+
#if __has_include("Composition.Experimental.SystemCompositionContextHelper.g.cpp")
|
|
5
|
+
#include "Composition.Experimental.SystemCompositionContextHelper.g.cpp"
|
|
6
6
|
#endif
|
|
7
7
|
#ifdef USE_WINUI3
|
|
8
|
-
#if __has_include("Composition.MicrosoftCompositionContextHelper.g.cpp")
|
|
9
|
-
#include "Composition.MicrosoftCompositionContextHelper.g.cpp"
|
|
8
|
+
#if __has_include("Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp")
|
|
9
|
+
#include "Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp"
|
|
10
10
|
#endif
|
|
11
11
|
#endif
|
|
12
12
|
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
#include <winrt/Microsoft.UI.Composition.interop.h>
|
|
24
24
|
#endif
|
|
25
25
|
|
|
26
|
-
namespace Microsoft::ReactNative::Composition {
|
|
26
|
+
namespace Microsoft::ReactNative::Composition::Experimental {
|
|
27
27
|
|
|
28
28
|
template <typename TSpriteVisual>
|
|
29
29
|
struct CompositionTypeTraits {};
|
|
@@ -91,7 +91,8 @@ struct CompositionTypeTraits<WindowsTypeTag> {
|
|
|
91
91
|
using IInnerCompositionVisual = IWindowsCompositionVisual;
|
|
92
92
|
using IInnerCompositionBrush = IWindowsCompositionBrush;
|
|
93
93
|
using IInnerCompositionDrawingSurface = IWindowsCompositionDrawingSurfaceInner;
|
|
94
|
-
using CompositionContextHelper =
|
|
94
|
+
using CompositionContextHelper =
|
|
95
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper;
|
|
95
96
|
};
|
|
96
97
|
using WindowsTypeRedirects = CompositionTypeTraits<WindowsTypeTag>;
|
|
97
98
|
|
|
@@ -159,7 +160,8 @@ struct CompositionTypeTraits<MicrosoftTypeTag> {
|
|
|
159
160
|
using IInnerCompositionVisual = IMicrosoftCompositionVisual;
|
|
160
161
|
using IInnerCompositionBrush = IMicrosoftCompositionBrush;
|
|
161
162
|
using IInnerCompositionDrawingSurface = IMicrosoftCompositionDrawingSurfaceInner;
|
|
162
|
-
using CompositionContextHelper =
|
|
163
|
+
using CompositionContextHelper =
|
|
164
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper;
|
|
163
165
|
};
|
|
164
166
|
using MicrosoftTypeRedirects = CompositionTypeTraits<MicrosoftTypeTag>;
|
|
165
167
|
#endif
|
|
@@ -188,7 +190,7 @@ struct GeometrySource : public winrt::implements<
|
|
|
188
190
|
template <typename TTypeRedirects>
|
|
189
191
|
struct CompDropShadow : public winrt::implements<
|
|
190
192
|
CompDropShadow<TTypeRedirects>,
|
|
191
|
-
winrt::Microsoft::ReactNative::Composition::IDropShadow,
|
|
193
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow,
|
|
192
194
|
typename TTypeRedirects::IInnerCompositionDropShadow> {
|
|
193
195
|
CompDropShadow(typename TTypeRedirects::DropShadow const &shadow) : m_shadow(shadow) {}
|
|
194
196
|
|
|
@@ -223,7 +225,7 @@ using MicrosoftCompDropShadow = CompDropShadow<MicrosoftTypeRedirects>;
|
|
|
223
225
|
template <typename TTypeRedirects>
|
|
224
226
|
struct CompBrush : public winrt::implements<
|
|
225
227
|
CompBrush<TTypeRedirects>,
|
|
226
|
-
winrt::Microsoft::ReactNative::Composition::IBrush,
|
|
228
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IBrush,
|
|
227
229
|
typename TTypeRedirects::IInnerCompositionBrush> {
|
|
228
230
|
CompBrush(typename TTypeRedirects::CompositionBrush const &brush) : m_brush(brush) {}
|
|
229
231
|
|
|
@@ -242,8 +244,8 @@ using MicrosoftCompBrush = CompBrush<MicrosoftTypeRedirects>;
|
|
|
242
244
|
template <typename TTypeRedirects>
|
|
243
245
|
struct CompDrawingSurfaceBrush : public winrt::implements<
|
|
244
246
|
CompDrawingSurfaceBrush<TTypeRedirects>,
|
|
245
|
-
winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush,
|
|
246
|
-
winrt::Microsoft::ReactNative::Composition::IBrush,
|
|
247
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush,
|
|
248
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IBrush,
|
|
247
249
|
typename TTypeRedirects::IInnerCompositionBrush,
|
|
248
250
|
ICompositionDrawingSurfaceInterop,
|
|
249
251
|
typename TTypeRedirects::IInnerCompositionDrawingSurface> {
|
|
@@ -284,23 +286,23 @@ struct CompDrawingSurfaceBrush : public winrt::implements<
|
|
|
284
286
|
m_brush.VerticalAlignmentRatio(ratio);
|
|
285
287
|
}
|
|
286
288
|
|
|
287
|
-
void Stretch(winrt::Microsoft::ReactNative::Composition::CompositionStretch mode) noexcept {
|
|
289
|
+
void Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch mode) noexcept {
|
|
288
290
|
static_assert(
|
|
289
|
-
static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
|
|
291
|
+
static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
|
|
290
292
|
TTypeRedirects::CompositionStretch::None) ==
|
|
291
|
-
winrt::Microsoft::ReactNative::Composition::CompositionStretch::None);
|
|
293
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
|
|
292
294
|
static_assert(
|
|
293
|
-
static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
|
|
295
|
+
static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
|
|
294
296
|
TTypeRedirects::CompositionStretch::Fill) ==
|
|
295
|
-
winrt::Microsoft::ReactNative::Composition::CompositionStretch::Fill);
|
|
297
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::Fill);
|
|
296
298
|
static_assert(
|
|
297
|
-
static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
|
|
299
|
+
static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
|
|
298
300
|
TTypeRedirects::CompositionStretch::Uniform) ==
|
|
299
|
-
winrt::Microsoft::ReactNative::Composition::CompositionStretch::Uniform);
|
|
301
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::Uniform);
|
|
300
302
|
static_assert(
|
|
301
|
-
static_cast<winrt::Microsoft::ReactNative::Composition::CompositionStretch>(
|
|
303
|
+
static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch>(
|
|
302
304
|
TTypeRedirects::CompositionStretch::UniformToFill) ==
|
|
303
|
-
winrt::Microsoft::ReactNative::Composition::CompositionStretch::UniformToFill);
|
|
305
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::UniformToFill);
|
|
304
306
|
|
|
305
307
|
m_brush.Stretch(static_cast<typename TTypeRedirects::CompositionStretch>(mode));
|
|
306
308
|
}
|
|
@@ -316,19 +318,19 @@ using MicrosoftCompDrawingSurfaceBrush = CompDrawingSurfaceBrush<MicrosoftTypeRe
|
|
|
316
318
|
|
|
317
319
|
template <typename TTypeRedirects>
|
|
318
320
|
void SetAnimationClass(
|
|
319
|
-
winrt::Microsoft::ReactNative::Composition::AnimationClass value,
|
|
321
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value,
|
|
320
322
|
typename const TTypeRedirects::Visual &visual) {
|
|
321
323
|
constexpr int64_t ScrollBarExpandBeginTime = 400; // ms
|
|
322
324
|
constexpr int64_t ScrollBarExpandDuration = 167; // ms
|
|
323
325
|
constexpr int64_t SwitchDuration = 167; // ms
|
|
324
326
|
|
|
325
327
|
switch (value) {
|
|
326
|
-
case winrt::Microsoft::ReactNative::Composition::AnimationClass::None: {
|
|
328
|
+
case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::None: {
|
|
327
329
|
visual.ImplicitAnimations(nullptr);
|
|
328
330
|
break;
|
|
329
331
|
}
|
|
330
332
|
|
|
331
|
-
case winrt::Microsoft::ReactNative::Composition::AnimationClass::SwitchThumb: {
|
|
333
|
+
case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::SwitchThumb: {
|
|
332
334
|
auto compositor = visual.Compositor();
|
|
333
335
|
auto offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
|
|
334
336
|
offsetAnimation.InsertExpressionKeyFrame(
|
|
@@ -344,7 +346,7 @@ void SetAnimationClass(
|
|
|
344
346
|
break;
|
|
345
347
|
}
|
|
346
348
|
|
|
347
|
-
case winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBar: {
|
|
349
|
+
case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBar: {
|
|
348
350
|
auto compositor = visual.Compositor();
|
|
349
351
|
|
|
350
352
|
auto opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
|
|
@@ -360,15 +362,15 @@ void SetAnimationClass(
|
|
|
360
362
|
break;
|
|
361
363
|
}
|
|
362
364
|
|
|
363
|
-
case winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBarThumbVertical:
|
|
364
|
-
case winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBarThumbHorizontal: {
|
|
365
|
+
case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBarThumbVertical:
|
|
366
|
+
case winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBarThumbHorizontal: {
|
|
365
367
|
auto compositor = visual.Compositor();
|
|
366
368
|
auto offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
|
|
367
369
|
// We cannot just use a DelayTime, since we want changes to the offset in the scrolling dirction to happen
|
|
368
370
|
// immediately, and only delay the offset changes used when hiding/showing the scrollbar
|
|
369
371
|
float delayStartFrameOffset =
|
|
370
372
|
static_cast<float>(ScrollBarExpandBeginTime) / (ScrollBarExpandBeginTime + ScrollBarExpandDuration);
|
|
371
|
-
if (value == winrt::Microsoft::ReactNative::Composition::AnimationClass::ScrollBarThumbVertical) {
|
|
373
|
+
if (value == winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass::ScrollBarThumbVertical) {
|
|
372
374
|
offsetAnimation.InsertExpressionKeyFrame(
|
|
373
375
|
0.0f, L"vector3(this.CurrentValue.X, this.FinalValue.Y, this.FinalValue.Z)");
|
|
374
376
|
offsetAnimation.InsertExpressionKeyFrame(
|
|
@@ -407,7 +409,9 @@ struct CompVisualImpl {
|
|
|
407
409
|
return m_visual;
|
|
408
410
|
}
|
|
409
411
|
|
|
410
|
-
void InsertAt(
|
|
412
|
+
void InsertAt(
|
|
413
|
+
const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
|
|
414
|
+
uint32_t index) noexcept {
|
|
411
415
|
auto containerChildren = InnerVisual().as<typename TTypeRedirects::ContainerVisual>().Children();
|
|
412
416
|
auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
|
|
413
417
|
if (index == 0) {
|
|
@@ -420,13 +424,13 @@ struct CompVisualImpl {
|
|
|
420
424
|
containerChildren.InsertAbove(compVisual, insertAfter.Current());
|
|
421
425
|
}
|
|
422
426
|
|
|
423
|
-
void Remove(const winrt::Microsoft::ReactNative::Composition::IVisual &visual) noexcept {
|
|
427
|
+
void Remove(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
|
|
424
428
|
auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
|
|
425
429
|
auto containerChildren = InnerVisual().as<typename TTypeRedirects::ContainerVisual>().Children();
|
|
426
430
|
containerChildren.Remove(compVisual);
|
|
427
431
|
}
|
|
428
432
|
|
|
429
|
-
winrt::Microsoft::ReactNative::Composition::IVisual GetAt(uint32_t index) noexcept {
|
|
433
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual GetAt(uint32_t index) noexcept {
|
|
430
434
|
auto containerChildren = m_visual.as<typename TTypeRedirects::ContainerVisual>().Children();
|
|
431
435
|
auto it = containerChildren.First();
|
|
432
436
|
for (uint32_t i = 0; i < index; i++)
|
|
@@ -488,11 +492,12 @@ struct CompVisualImpl {
|
|
|
488
492
|
m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
|
|
489
493
|
}
|
|
490
494
|
|
|
491
|
-
winrt::Microsoft::ReactNative::Composition::BackfaceVisibility BackfaceVisibility() const noexcept {
|
|
492
|
-
return static_cast<winrt::Microsoft::ReactNative::Composition::BackfaceVisibility>(
|
|
495
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility BackfaceVisibility() const noexcept {
|
|
496
|
+
return static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility>(
|
|
497
|
+
m_visual.BackfaceVisibility());
|
|
493
498
|
}
|
|
494
499
|
|
|
495
|
-
void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::BackfaceVisibility value) noexcept {
|
|
500
|
+
void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility value) noexcept {
|
|
496
501
|
m_visual.BackfaceVisibility(static_cast<typename TTypeRedirects::CompositionBackfaceVisibility>(value));
|
|
497
502
|
}
|
|
498
503
|
|
|
@@ -504,7 +509,7 @@ struct CompVisualImpl {
|
|
|
504
509
|
m_visual.Comment(value);
|
|
505
510
|
}
|
|
506
511
|
|
|
507
|
-
void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
|
|
512
|
+
void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
|
|
508
513
|
SetAnimationClass<TTypeRedirects>(value, m_visual);
|
|
509
514
|
}
|
|
510
515
|
|
|
@@ -515,7 +520,7 @@ struct CompVisualImpl {
|
|
|
515
520
|
template <typename TTypeRedirects>
|
|
516
521
|
struct CompVisual : public winrt::implements<
|
|
517
522
|
CompVisual<TTypeRedirects>,
|
|
518
|
-
winrt::Microsoft::ReactNative::Composition::IVisual,
|
|
523
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
|
|
519
524
|
typename TTypeRedirects::IInnerCompositionVisual,
|
|
520
525
|
IVisualInterop>,
|
|
521
526
|
CompVisualImpl<TTypeRedirects> {
|
|
@@ -540,8 +545,8 @@ using MicrosoftCompVisual = CompVisual<MicrosoftTypeRedirects>;
|
|
|
540
545
|
template <typename TTypeRedirects>
|
|
541
546
|
struct CompSpriteVisual : winrt::implements<
|
|
542
547
|
CompSpriteVisual<TTypeRedirects>,
|
|
543
|
-
winrt::Microsoft::ReactNative::Composition::ISpriteVisual,
|
|
544
|
-
winrt::Microsoft::ReactNative::Composition::IVisual,
|
|
548
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual,
|
|
549
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
|
|
545
550
|
typename TTypeRedirects::IInnerCompositionVisual,
|
|
546
551
|
IVisualInterop>,
|
|
547
552
|
CompVisualImpl<TTypeRedirects, typename TTypeRedirects::SpriteVisual> {
|
|
@@ -558,11 +563,11 @@ struct CompSpriteVisual : winrt::implements<
|
|
|
558
563
|
Super::SetClippingPath(clippingPath);
|
|
559
564
|
}
|
|
560
565
|
|
|
561
|
-
void Brush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
|
|
566
|
+
void Brush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
|
|
562
567
|
Super::m_visual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
|
|
563
568
|
}
|
|
564
569
|
|
|
565
|
-
void Shadow(const winrt::Microsoft::ReactNative::Composition::IDropShadow &shadow) noexcept {
|
|
570
|
+
void Shadow(const winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow &shadow) noexcept {
|
|
566
571
|
Super::m_visual.Shadow(TTypeRedirects::CompositionContextHelper::InnerDropShadow(shadow));
|
|
567
572
|
}
|
|
568
573
|
};
|
|
@@ -572,13 +577,14 @@ using MicrosoftCompSpriteVisual = CompSpriteVisual<MicrosoftTypeRedirects>;
|
|
|
572
577
|
#endif
|
|
573
578
|
|
|
574
579
|
template <typename TTypeRedirects>
|
|
575
|
-
struct CompRoundedRectangleVisual
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
580
|
+
struct CompRoundedRectangleVisual
|
|
581
|
+
: winrt::implements<
|
|
582
|
+
CompRoundedRectangleVisual<TTypeRedirects>,
|
|
583
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual,
|
|
584
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
|
|
585
|
+
typename TTypeRedirects::IInnerCompositionVisual,
|
|
586
|
+
IVisualInterop>,
|
|
587
|
+
CompVisualImpl<TTypeRedirects> {
|
|
582
588
|
using Super = CompVisualImpl<TTypeRedirects>;
|
|
583
589
|
CompRoundedRectangleVisual(typename TTypeRedirects::ShapeVisual const &visual) : Super(visual) {
|
|
584
590
|
auto compositor = visual.Compositor();
|
|
@@ -622,7 +628,7 @@ struct CompRoundedRectangleVisual : winrt::implements<
|
|
|
622
628
|
Super::m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
|
|
623
629
|
}
|
|
624
630
|
|
|
625
|
-
void Brush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
|
|
631
|
+
void Brush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
|
|
626
632
|
m_spriteShape.FillBrush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
|
|
627
633
|
}
|
|
628
634
|
|
|
@@ -631,7 +637,7 @@ struct CompRoundedRectangleVisual : winrt::implements<
|
|
|
631
637
|
updateGeometry();
|
|
632
638
|
}
|
|
633
639
|
|
|
634
|
-
void StrokeBrush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
|
|
640
|
+
void StrokeBrush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
|
|
635
641
|
m_spriteShape.StrokeBrush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
|
|
636
642
|
}
|
|
637
643
|
|
|
@@ -653,9 +659,10 @@ using WindowsCompRoundedRectangleVisual = CompRoundedRectangleVisual<WindowsType
|
|
|
653
659
|
using MicrosoftCompRoundedRectangleVisual = CompRoundedRectangleVisual<MicrosoftTypeRedirects>;
|
|
654
660
|
#endif
|
|
655
661
|
|
|
656
|
-
struct CompScrollPositionChangedArgs
|
|
657
|
-
|
|
658
|
-
|
|
662
|
+
struct CompScrollPositionChangedArgs
|
|
663
|
+
: winrt::implements<
|
|
664
|
+
CompScrollPositionChangedArgs,
|
|
665
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> {
|
|
659
666
|
CompScrollPositionChangedArgs(winrt::Windows::Foundation::Numerics::float2 position) : m_position(position) {}
|
|
660
667
|
|
|
661
668
|
winrt::Windows::Foundation::Numerics::float2 Position() const noexcept {
|
|
@@ -669,8 +676,8 @@ struct CompScrollPositionChangedArgs : winrt::implements<
|
|
|
669
676
|
template <typename TTypeRedirects>
|
|
670
677
|
struct CompScrollerVisual : winrt::implements<
|
|
671
678
|
CompScrollerVisual<TTypeRedirects>,
|
|
672
|
-
winrt::Microsoft::ReactNative::Composition::IScrollVisual,
|
|
673
|
-
winrt::Microsoft::ReactNative::Composition::IVisual,
|
|
679
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual,
|
|
680
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
|
|
674
681
|
typename TTypeRedirects::IInnerCompositionVisual,
|
|
675
682
|
IVisualInterop> {
|
|
676
683
|
struct ScrollInteractionTrackerOwner
|
|
@@ -749,7 +756,9 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
749
756
|
return m_visual;
|
|
750
757
|
}
|
|
751
758
|
|
|
752
|
-
void InsertAt(
|
|
759
|
+
void InsertAt(
|
|
760
|
+
const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
|
|
761
|
+
uint32_t index) noexcept {
|
|
753
762
|
auto containerChildren = m_contentVisual.Children();
|
|
754
763
|
auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
|
|
755
764
|
if (index == 0) {
|
|
@@ -762,13 +771,13 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
762
771
|
containerChildren.InsertAbove(compVisual, insertAfter.Current());
|
|
763
772
|
}
|
|
764
773
|
|
|
765
|
-
void Remove(const winrt::Microsoft::ReactNative::Composition::IVisual &visual) noexcept {
|
|
774
|
+
void Remove(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
|
|
766
775
|
auto compVisual = TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
|
|
767
776
|
auto containerChildren = m_contentVisual.Children();
|
|
768
777
|
containerChildren.Remove(compVisual);
|
|
769
778
|
}
|
|
770
779
|
|
|
771
|
-
winrt::Microsoft::ReactNative::Composition::IVisual GetAt(uint32_t index) noexcept {
|
|
780
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual GetAt(uint32_t index) noexcept {
|
|
772
781
|
auto containerChildren = m_visual.as<typename TTypeRedirects::ContainerVisual>().Children();
|
|
773
782
|
auto it = containerChildren.First();
|
|
774
783
|
for (uint32_t i = 0; i < index; i++)
|
|
@@ -776,7 +785,7 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
776
785
|
return TTypeRedirects::CompositionContextHelper::CreateVisual(it.Current());
|
|
777
786
|
}
|
|
778
787
|
|
|
779
|
-
void Brush(const winrt::Microsoft::ReactNative::Composition::IBrush &brush) noexcept {
|
|
788
|
+
void Brush(const winrt::Microsoft::ReactNative::Composition::Experimental::IBrush &brush) noexcept {
|
|
780
789
|
m_visual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
|
|
781
790
|
}
|
|
782
791
|
|
|
@@ -824,11 +833,12 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
824
833
|
m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
|
|
825
834
|
}
|
|
826
835
|
|
|
827
|
-
winrt::Microsoft::ReactNative::Composition::BackfaceVisibility BackfaceVisibility() {
|
|
828
|
-
return static_cast<winrt::Microsoft::ReactNative::Composition::BackfaceVisibility>(
|
|
836
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility BackfaceVisibility() {
|
|
837
|
+
return static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility>(
|
|
838
|
+
m_visual.BackfaceVisibility());
|
|
829
839
|
}
|
|
830
840
|
|
|
831
|
-
void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::BackfaceVisibility value) {
|
|
841
|
+
void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility value) {
|
|
832
842
|
m_visual.BackfaceVisibility(static_cast<typename TTypeRedirects::CompositionBackfaceVisibility>(value));
|
|
833
843
|
}
|
|
834
844
|
|
|
@@ -852,13 +862,14 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
852
862
|
m_visual.Clip(clip);
|
|
853
863
|
}
|
|
854
864
|
|
|
855
|
-
void Shadow(const winrt::Microsoft::ReactNative::Composition::IDropShadow &shadow) noexcept {
|
|
865
|
+
void Shadow(const winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow &shadow) noexcept {
|
|
856
866
|
m_visual.Shadow(TTypeRedirects::CompositionContextHelper::InnerDropShadow(shadow));
|
|
857
867
|
}
|
|
858
868
|
|
|
859
869
|
winrt::event_token ScrollPositionChanged(
|
|
860
870
|
winrt::Windows::Foundation::EventHandler<
|
|
861
|
-
winrt::Microsoft::ReactNative::Composition::IScrollPositionChangedArgs> const
|
|
871
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> const
|
|
872
|
+
&handler) noexcept {
|
|
862
873
|
return m_scrollPositionChangedEvent.add(handler);
|
|
863
874
|
}
|
|
864
875
|
|
|
@@ -927,7 +938,7 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
927
938
|
}
|
|
928
939
|
}
|
|
929
940
|
|
|
930
|
-
void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
|
|
941
|
+
void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
|
|
931
942
|
SetAnimationClass<TTypeRedirects>(value, m_visual);
|
|
932
943
|
}
|
|
933
944
|
|
|
@@ -949,8 +960,8 @@ struct CompScrollerVisual : winrt::implements<
|
|
|
949
960
|
winrt::Windows::Foundation::Numerics::float3 m_currentPosition;
|
|
950
961
|
winrt::Windows::Foundation::Numerics::float2 m_contentSize{0};
|
|
951
962
|
winrt::Windows::Foundation::Numerics::float2 m_visualSize{0};
|
|
952
|
-
winrt::event<
|
|
953
|
-
winrt::
|
|
963
|
+
winrt::event<winrt::Windows::Foundation::EventHandler<
|
|
964
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
|
|
954
965
|
m_scrollPositionChangedEvent;
|
|
955
966
|
typename TTypeRedirects::SpriteVisual m_visual{nullptr};
|
|
956
967
|
typename TTypeRedirects::SpriteVisual m_contentVisual{nullptr};
|
|
@@ -965,8 +976,8 @@ using MicrosoftCompScrollerVisual = CompScrollerVisual<MicrosoftTypeRedirects>;
|
|
|
965
976
|
template <typename TTypeRedirects>
|
|
966
977
|
struct CompActivityVisual : winrt::implements<
|
|
967
978
|
CompActivityVisual<TTypeRedirects>,
|
|
968
|
-
winrt::Microsoft::ReactNative::Composition::IActivityVisual,
|
|
969
|
-
winrt::Microsoft::ReactNative::Composition::IVisual,
|
|
979
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual,
|
|
980
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual,
|
|
970
981
|
typename TTypeRedirects::IInnerCompositionVisual,
|
|
971
982
|
IVisualInterop> {
|
|
972
983
|
/************************************************************************************
|
|
@@ -1311,7 +1322,7 @@ struct CompActivityVisual : winrt::implements<
|
|
|
1311
1322
|
_root.StartAnimation(L"Progress", progressAnimation);
|
|
1312
1323
|
}
|
|
1313
1324
|
|
|
1314
|
-
void Brush(winrt::Microsoft::ReactNative::Composition::IBrush brush) noexcept {
|
|
1325
|
+
void Brush(winrt::Microsoft::ReactNative::Composition::Experimental::IBrush brush) noexcept {
|
|
1315
1326
|
auto innerBrush = TTypeRedirects::CompositionContextHelper::InnerBrush(brush);
|
|
1316
1327
|
if (brush) {
|
|
1317
1328
|
_themeProperties.InsertVector4(
|
|
@@ -1330,7 +1341,9 @@ struct CompActivityVisual : winrt::implements<
|
|
|
1330
1341
|
return m_visual;
|
|
1331
1342
|
}
|
|
1332
1343
|
|
|
1333
|
-
void InsertAt(
|
|
1344
|
+
void InsertAt(
|
|
1345
|
+
const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
|
|
1346
|
+
uint32_t index) noexcept {
|
|
1334
1347
|
auto containerChildren = m_contentVisual.Children();
|
|
1335
1348
|
auto compVisual = typename TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
|
|
1336
1349
|
if (index == 0) {
|
|
@@ -1343,13 +1356,13 @@ struct CompActivityVisual : winrt::implements<
|
|
|
1343
1356
|
containerChildren.InsertAbove(compVisual, insertAfter.Current());
|
|
1344
1357
|
}
|
|
1345
1358
|
|
|
1346
|
-
void Remove(const winrt::Microsoft::ReactNative::Composition::IVisual &visual) noexcept {
|
|
1359
|
+
void Remove(const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual) noexcept {
|
|
1347
1360
|
auto compVisual = typename TTypeRedirects::CompositionContextHelper::InnerVisual(visual);
|
|
1348
1361
|
auto containerChildren = m_contentVisual.Children();
|
|
1349
1362
|
containerChildren.Remove(compVisual);
|
|
1350
1363
|
}
|
|
1351
1364
|
|
|
1352
|
-
winrt::Microsoft::ReactNative::Composition::IVisual GetAt(uint32_t index) noexcept {
|
|
1365
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual GetAt(uint32_t index) noexcept {
|
|
1353
1366
|
auto containerChildren = m_visual.as<typename TTypeRedirects::ContainerVisual>().Children();
|
|
1354
1367
|
auto it = containerChildren.First();
|
|
1355
1368
|
for (uint32_t i = 0; i < index; i++)
|
|
@@ -1399,11 +1412,12 @@ struct CompActivityVisual : winrt::implements<
|
|
|
1399
1412
|
m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
|
|
1400
1413
|
}
|
|
1401
1414
|
|
|
1402
|
-
winrt::Microsoft::ReactNative::Composition::BackfaceVisibility BackfaceVisibility() const noexcept {
|
|
1403
|
-
return static_cast<winrt::Microsoft::ReactNative::Composition::BackfaceVisibility>(
|
|
1415
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility BackfaceVisibility() const noexcept {
|
|
1416
|
+
return static_cast<winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility>(
|
|
1417
|
+
m_visual.BackfaceVisibility());
|
|
1404
1418
|
}
|
|
1405
1419
|
|
|
1406
|
-
void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::BackfaceVisibility value) noexcept {
|
|
1420
|
+
void BackfaceVisibility(winrt::Microsoft::ReactNative::Composition::Experimental::BackfaceVisibility value) noexcept {
|
|
1407
1421
|
m_visual.BackfaceVisibility(static_cast<typename TTypeRedirects::CompositionBackfaceVisibility>(value));
|
|
1408
1422
|
}
|
|
1409
1423
|
|
|
@@ -1427,7 +1441,7 @@ struct CompActivityVisual : winrt::implements<
|
|
|
1427
1441
|
m_visual.Clip(clip);
|
|
1428
1442
|
}
|
|
1429
1443
|
|
|
1430
|
-
void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
|
|
1444
|
+
void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
|
|
1431
1445
|
SetAnimationClass<TTypeRedirects>(value, m_visual);
|
|
1432
1446
|
}
|
|
1433
1447
|
|
|
@@ -1441,8 +1455,9 @@ using MicrosoftCompActivityVisual = CompActivityVisual<MicrosoftTypeRedirects>;
|
|
|
1441
1455
|
#endif
|
|
1442
1456
|
|
|
1443
1457
|
template <typename TTypeRedirects>
|
|
1444
|
-
struct CompCaretVisual
|
|
1445
|
-
|
|
1458
|
+
struct CompCaretVisual : winrt::implements<
|
|
1459
|
+
CompCaretVisual<TTypeRedirects>,
|
|
1460
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual> {
|
|
1446
1461
|
CompCaretVisual(typename TTypeRedirects::Compositor const &compositor)
|
|
1447
1462
|
: m_compositor(compositor),
|
|
1448
1463
|
m_compVisual(compositor.CreateSpriteVisual()),
|
|
@@ -1468,13 +1483,13 @@ struct CompCaretVisual
|
|
|
1468
1483
|
m_opacityAnimation.IterationCount(500);
|
|
1469
1484
|
}
|
|
1470
1485
|
|
|
1471
|
-
winrt::Microsoft::ReactNative::Composition::IVisual CreateVisual() const noexcept;
|
|
1486
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CreateVisual() const noexcept;
|
|
1472
1487
|
|
|
1473
|
-
winrt::Microsoft::ReactNative::Composition::IVisual InnerVisual() const noexcept {
|
|
1488
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual InnerVisual() const noexcept {
|
|
1474
1489
|
return m_visual;
|
|
1475
1490
|
}
|
|
1476
1491
|
|
|
1477
|
-
void Brush(winrt::Microsoft::ReactNative::Composition::IBrush brush) noexcept {
|
|
1492
|
+
void Brush(winrt::Microsoft::ReactNative::Composition::Experimental::IBrush brush) noexcept {
|
|
1478
1493
|
m_compVisual.Brush(TTypeRedirects::CompositionContextHelper::InnerBrush(brush));
|
|
1479
1494
|
}
|
|
1480
1495
|
|
|
@@ -1502,35 +1517,36 @@ struct CompCaretVisual
|
|
|
1502
1517
|
}
|
|
1503
1518
|
}
|
|
1504
1519
|
|
|
1505
|
-
void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
|
|
1520
|
+
void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
|
|
1506
1521
|
SetAnimationClass(value, m_compVisual);
|
|
1507
1522
|
}
|
|
1508
1523
|
|
|
1509
1524
|
private:
|
|
1510
1525
|
bool m_isVisible{true};
|
|
1511
1526
|
typename TTypeRedirects::SpriteVisual m_compVisual;
|
|
1512
|
-
winrt::Microsoft::ReactNative::Composition::IVisual m_visual;
|
|
1527
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_visual;
|
|
1513
1528
|
typename TTypeRedirects::ScalarKeyFrameAnimation m_opacityAnimation;
|
|
1514
1529
|
typename TTypeRedirects::Compositor m_compositor{nullptr};
|
|
1515
1530
|
};
|
|
1516
1531
|
|
|
1517
|
-
winrt::Microsoft::ReactNative::Composition::IVisual CompCaretVisual<WindowsTypeRedirects>::CreateVisual()
|
|
1532
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CompCaretVisual<WindowsTypeRedirects>::CreateVisual()
|
|
1518
1533
|
const noexcept {
|
|
1519
|
-
return winrt::make<Composition::WindowsCompSpriteVisual>(m_compVisual);
|
|
1534
|
+
return winrt::make<Composition::Experimental::WindowsCompSpriteVisual>(m_compVisual);
|
|
1520
1535
|
}
|
|
1521
1536
|
using WindowsCompCaretVisual = CompCaretVisual<WindowsTypeRedirects>;
|
|
1522
1537
|
|
|
1523
1538
|
#ifdef USE_WINUI3
|
|
1524
|
-
winrt::Microsoft::ReactNative::Composition::IVisual
|
|
1525
|
-
|
|
1526
|
-
return winrt::make<Composition::MicrosoftCompSpriteVisual>(m_compVisual);
|
|
1539
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
|
|
1540
|
+
CompCaretVisual<MicrosoftTypeRedirects>::CreateVisual() const noexcept {
|
|
1541
|
+
return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compVisual);
|
|
1527
1542
|
}
|
|
1528
1543
|
using MicrosoftCompCaretVisual = CompCaretVisual<MicrosoftTypeRedirects>;
|
|
1529
1544
|
#endif
|
|
1530
1545
|
|
|
1531
1546
|
template <typename TTypeRedirects>
|
|
1532
|
-
struct CompFocusVisual
|
|
1533
|
-
|
|
1547
|
+
struct CompFocusVisual : winrt::implements<
|
|
1548
|
+
CompFocusVisual<TTypeRedirects>,
|
|
1549
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual> {
|
|
1534
1550
|
CompFocusVisual(typename TTypeRedirects::Compositor const &compositor)
|
|
1535
1551
|
: m_compVisual(compositor.CreateSpriteVisual()), m_brush(compositor.CreateNineGridBrush()) {
|
|
1536
1552
|
m_visual = CreateVisual();
|
|
@@ -1542,9 +1558,9 @@ struct CompFocusVisual
|
|
|
1542
1558
|
m_brush.IsCenterHollow(true);
|
|
1543
1559
|
}
|
|
1544
1560
|
|
|
1545
|
-
winrt::Microsoft::ReactNative::Composition::IVisual CreateVisual() noexcept;
|
|
1561
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CreateVisual() noexcept;
|
|
1546
1562
|
|
|
1547
|
-
winrt::Microsoft::ReactNative::Composition::IVisual InnerVisual() const noexcept {
|
|
1563
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual InnerVisual() const noexcept {
|
|
1548
1564
|
return m_visual;
|
|
1549
1565
|
}
|
|
1550
1566
|
|
|
@@ -1573,7 +1589,7 @@ struct CompFocusVisual
|
|
|
1573
1589
|
m_brush.SetInsets(inset, inset, inset, inset);
|
|
1574
1590
|
}
|
|
1575
1591
|
|
|
1576
|
-
void AnimationClass(winrt::Microsoft::ReactNative::Composition::AnimationClass value) noexcept {
|
|
1592
|
+
void AnimationClass(winrt::Microsoft::ReactNative::Composition::Experimental::AnimationClass value) noexcept {
|
|
1577
1593
|
SetAnimationClass(value, m_compVisual);
|
|
1578
1594
|
}
|
|
1579
1595
|
|
|
@@ -1581,17 +1597,19 @@ struct CompFocusVisual
|
|
|
1581
1597
|
float m_scaleFactor{0};
|
|
1582
1598
|
typename TTypeRedirects::CompositionNineGridBrush m_brush;
|
|
1583
1599
|
typename TTypeRedirects::SpriteVisual m_compVisual;
|
|
1584
|
-
winrt::Microsoft::ReactNative::Composition::IVisual m_visual{nullptr};
|
|
1600
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual m_visual{nullptr};
|
|
1585
1601
|
};
|
|
1586
1602
|
|
|
1587
|
-
winrt::Microsoft::ReactNative::Composition::IVisual
|
|
1588
|
-
|
|
1603
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
|
|
1604
|
+
CompFocusVisual<WindowsTypeRedirects>::CreateVisual() noexcept {
|
|
1605
|
+
return winrt::make<Composition::Experimental::WindowsCompSpriteVisual>(m_compVisual);
|
|
1589
1606
|
}
|
|
1590
1607
|
using WindowsCompFocusVisual = CompFocusVisual<WindowsTypeRedirects>;
|
|
1591
1608
|
|
|
1592
1609
|
#ifdef USE_WINUI3
|
|
1593
|
-
winrt::Microsoft::ReactNative::Composition::IVisual
|
|
1594
|
-
|
|
1610
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
|
|
1611
|
+
CompFocusVisual<MicrosoftTypeRedirects>::CreateVisual() noexcept {
|
|
1612
|
+
return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compVisual);
|
|
1595
1613
|
}
|
|
1596
1614
|
using MicrosoftCompFocusVisual = CompFocusVisual<MicrosoftTypeRedirects>;
|
|
1597
1615
|
#endif
|
|
@@ -1599,7 +1617,7 @@ using MicrosoftCompFocusVisual = CompFocusVisual<MicrosoftTypeRedirects>;
|
|
|
1599
1617
|
template <typename TTypeRedirects>
|
|
1600
1618
|
struct CompContext : winrt::implements<
|
|
1601
1619
|
CompContext<TTypeRedirects>,
|
|
1602
|
-
winrt::Microsoft::ReactNative::Composition::ICompositionContext,
|
|
1620
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext,
|
|
1603
1621
|
typename TTypeRedirects::IInnerCompositionCompositor,
|
|
1604
1622
|
ICompositionContextInterop> {
|
|
1605
1623
|
CompContext(typename TTypeRedirects::Compositor const &compositor) : m_compositor(compositor) {}
|
|
@@ -1673,26 +1691,28 @@ struct CompContext : winrt::implements<
|
|
|
1673
1691
|
return m_d2dDevice;
|
|
1674
1692
|
}
|
|
1675
1693
|
|
|
1676
|
-
winrt::Microsoft::ReactNative::Composition::ISpriteVisual CreateSpriteVisual() noexcept;
|
|
1694
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual CreateSpriteVisual() noexcept;
|
|
1677
1695
|
|
|
1678
|
-
winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual
|
|
1696
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual
|
|
1697
|
+
CreateRoundedRectangleVisual() noexcept;
|
|
1679
1698
|
|
|
1680
|
-
winrt::Microsoft::ReactNative::Composition::IScrollVisual CreateScrollerVisual() noexcept;
|
|
1699
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual CreateScrollerVisual() noexcept;
|
|
1681
1700
|
|
|
1682
|
-
winrt::Microsoft::ReactNative::Composition::IActivityVisual CreateActivityVisual() noexcept;
|
|
1701
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual CreateActivityVisual() noexcept;
|
|
1683
1702
|
|
|
1684
|
-
winrt::Microsoft::ReactNative::Composition::IDropShadow CreateDropShadow() noexcept;
|
|
1703
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow CreateDropShadow() noexcept;
|
|
1685
1704
|
|
|
1686
|
-
winrt::Microsoft::ReactNative::Composition::IBrush CreateColorBrush(
|
|
1705
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IBrush CreateColorBrush(
|
|
1706
|
+
winrt::Windows::UI::Color color) noexcept;
|
|
1687
1707
|
|
|
1688
|
-
winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush CreateDrawingSurfaceBrush(
|
|
1708
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush CreateDrawingSurfaceBrush(
|
|
1689
1709
|
winrt::Windows::Foundation::Size surfaceSize,
|
|
1690
1710
|
winrt::Windows::Graphics::DirectX::DirectXPixelFormat pixelFormat,
|
|
1691
1711
|
winrt::Windows::Graphics::DirectX::DirectXAlphaMode alphaMode) noexcept;
|
|
1692
1712
|
|
|
1693
|
-
winrt::Microsoft::ReactNative::Composition::ICaretVisual CreateCaretVisual() noexcept;
|
|
1713
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual CreateCaretVisual() noexcept;
|
|
1694
1714
|
|
|
1695
|
-
winrt::Microsoft::ReactNative::Composition::IFocusVisual CreateFocusVisual() noexcept;
|
|
1715
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual CreateFocusVisual() noexcept;
|
|
1696
1716
|
|
|
1697
1717
|
typename TTypeRedirects::CompositionGraphicsDevice CompositionGraphicsDevice() noexcept;
|
|
1698
1718
|
|
|
@@ -1709,52 +1729,53 @@ struct CompContext : winrt::implements<
|
|
|
1709
1729
|
winrt::com_ptr<ID3D11DeviceContext> m_d3dDeviceContext;
|
|
1710
1730
|
};
|
|
1711
1731
|
|
|
1712
|
-
winrt::Microsoft::ReactNative::Composition::ISpriteVisual
|
|
1732
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual
|
|
1713
1733
|
CompContext<WindowsTypeRedirects>::CreateSpriteVisual() noexcept {
|
|
1714
|
-
return winrt::make<Composition::WindowsCompSpriteVisual>(m_compositor.CreateSpriteVisual());
|
|
1734
|
+
return winrt::make<Composition::Experimental::WindowsCompSpriteVisual>(m_compositor.CreateSpriteVisual());
|
|
1715
1735
|
}
|
|
1716
1736
|
|
|
1717
|
-
winrt::Microsoft::ReactNative::Composition::IScrollVisual
|
|
1737
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual
|
|
1718
1738
|
CompContext<WindowsTypeRedirects>::CreateScrollerVisual() noexcept {
|
|
1719
|
-
return winrt::make<Composition::WindowsCompScrollerVisual>(m_compositor.CreateSpriteVisual());
|
|
1739
|
+
return winrt::make<Composition::Experimental::WindowsCompScrollerVisual>(m_compositor.CreateSpriteVisual());
|
|
1720
1740
|
}
|
|
1721
1741
|
|
|
1722
|
-
winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual
|
|
1742
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual
|
|
1723
1743
|
CompContext<WindowsTypeRedirects>::CreateRoundedRectangleVisual() noexcept {
|
|
1724
|
-
return winrt::make<Composition::WindowsCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
|
|
1744
|
+
return winrt::make<Composition::Experimental::WindowsCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
|
|
1725
1745
|
}
|
|
1726
1746
|
|
|
1727
|
-
winrt::Microsoft::ReactNative::Composition::IActivityVisual
|
|
1747
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual
|
|
1728
1748
|
CompContext<WindowsTypeRedirects>::CreateActivityVisual() noexcept {
|
|
1729
|
-
return winrt::make<Composition::WindowsCompActivityVisual>(m_compositor.CreateSpriteVisual());
|
|
1749
|
+
return winrt::make<Composition::Experimental::WindowsCompActivityVisual>(m_compositor.CreateSpriteVisual());
|
|
1730
1750
|
}
|
|
1731
1751
|
|
|
1732
|
-
winrt::Microsoft::ReactNative::Composition::IDropShadow
|
|
1733
|
-
|
|
1752
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow
|
|
1753
|
+
CompContext<WindowsTypeRedirects>::CreateDropShadow() noexcept {
|
|
1754
|
+
return winrt::make<Composition::Experimental::WindowsCompDropShadow>(m_compositor.CreateDropShadow());
|
|
1734
1755
|
}
|
|
1735
1756
|
|
|
1736
|
-
winrt::Microsoft::ReactNative::Composition::IBrush CompContext<WindowsTypeRedirects>::CreateColorBrush(
|
|
1757
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IBrush CompContext<WindowsTypeRedirects>::CreateColorBrush(
|
|
1737
1758
|
winrt::Windows::UI::Color color) noexcept {
|
|
1738
|
-
return winrt::make<Composition::WindowsCompBrush>(m_compositor.CreateColorBrush(color));
|
|
1759
|
+
return winrt::make<Composition::Experimental::WindowsCompBrush>(m_compositor.CreateColorBrush(color));
|
|
1739
1760
|
}
|
|
1740
1761
|
|
|
1741
|
-
winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush
|
|
1762
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush
|
|
1742
1763
|
CompContext<WindowsTypeRedirects>::CreateDrawingSurfaceBrush(
|
|
1743
1764
|
winrt::Windows::Foundation::Size surfaceSize,
|
|
1744
1765
|
winrt::Windows::Graphics::DirectX::DirectXPixelFormat pixelFormat,
|
|
1745
1766
|
winrt::Windows::Graphics::DirectX::DirectXAlphaMode alphaMode) noexcept {
|
|
1746
|
-
return winrt::make<Composition::WindowsCompDrawingSurfaceBrush>(
|
|
1767
|
+
return winrt::make<Composition::Experimental::WindowsCompDrawingSurfaceBrush>(
|
|
1747
1768
|
m_compositor, CompositionGraphicsDevice().CreateDrawingSurface(surfaceSize, pixelFormat, alphaMode));
|
|
1748
1769
|
}
|
|
1749
1770
|
|
|
1750
|
-
winrt::Microsoft::ReactNative::Composition::ICaretVisual
|
|
1771
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual
|
|
1751
1772
|
CompContext<WindowsTypeRedirects>::CreateCaretVisual() noexcept {
|
|
1752
|
-
return winrt::make<Composition::WindowsCompCaretVisual>(m_compositor);
|
|
1773
|
+
return winrt::make<Composition::Experimental::WindowsCompCaretVisual>(m_compositor);
|
|
1753
1774
|
}
|
|
1754
1775
|
|
|
1755
|
-
winrt::Microsoft::ReactNative::Composition::IFocusVisual
|
|
1776
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual
|
|
1756
1777
|
CompContext<WindowsTypeRedirects>::CreateFocusVisual() noexcept {
|
|
1757
|
-
return winrt::make<Composition::WindowsCompFocusVisual>(m_compositor);
|
|
1778
|
+
return winrt::make<Composition::Experimental::WindowsCompFocusVisual>(m_compositor);
|
|
1758
1779
|
}
|
|
1759
1780
|
|
|
1760
1781
|
template <>
|
|
@@ -1779,42 +1800,42 @@ CompContext<WindowsTypeRedirects>::CompositionGraphicsDevice() noexcept {
|
|
|
1779
1800
|
using WindowsCompContext = CompContext<WindowsTypeRedirects>;
|
|
1780
1801
|
|
|
1781
1802
|
#ifdef USE_WINUI3
|
|
1782
|
-
winrt::Microsoft::ReactNative::Composition::ISpriteVisual
|
|
1803
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual
|
|
1783
1804
|
CompContext<MicrosoftTypeRedirects>::CreateSpriteVisual() noexcept {
|
|
1784
|
-
return winrt::make<Composition::MicrosoftCompSpriteVisual>(m_compositor.CreateSpriteVisual());
|
|
1805
|
+
return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compositor.CreateSpriteVisual());
|
|
1785
1806
|
}
|
|
1786
1807
|
|
|
1787
|
-
winrt::Microsoft::ReactNative::Composition::IScrollVisual
|
|
1808
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IScrollVisual
|
|
1788
1809
|
CompContext<MicrosoftTypeRedirects>::CreateScrollerVisual() noexcept {
|
|
1789
|
-
return winrt::make<Composition::MicrosoftCompScrollerVisual>(m_compositor.CreateSpriteVisual());
|
|
1810
|
+
return winrt::make<Composition::Experimental::MicrosoftCompScrollerVisual>(m_compositor.CreateSpriteVisual());
|
|
1790
1811
|
}
|
|
1791
1812
|
|
|
1792
|
-
winrt::Microsoft::ReactNative::Composition::IRoundedRectangleVisual
|
|
1813
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IRoundedRectangleVisual
|
|
1793
1814
|
CompContext<MicrosoftTypeRedirects>::CreateRoundedRectangleVisual() noexcept {
|
|
1794
|
-
return winrt::make<Composition::MicrosoftCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
|
|
1815
|
+
return winrt::make<Composition::Experimental::MicrosoftCompRoundedRectangleVisual>(m_compositor.CreateShapeVisual());
|
|
1795
1816
|
}
|
|
1796
1817
|
|
|
1797
|
-
winrt::Microsoft::ReactNative::Composition::IActivityVisual
|
|
1818
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IActivityVisual
|
|
1798
1819
|
CompContext<MicrosoftTypeRedirects>::CreateActivityVisual() noexcept {
|
|
1799
|
-
return winrt::make<Composition::MicrosoftCompActivityVisual>(m_compositor.CreateSpriteVisual());
|
|
1820
|
+
return winrt::make<Composition::Experimental::MicrosoftCompActivityVisual>(m_compositor.CreateSpriteVisual());
|
|
1800
1821
|
}
|
|
1801
1822
|
|
|
1802
|
-
winrt::Microsoft::ReactNative::Composition::IDropShadow
|
|
1823
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDropShadow
|
|
1803
1824
|
CompContext<MicrosoftTypeRedirects>::CreateDropShadow() noexcept {
|
|
1804
|
-
return winrt::make<Composition::MicrosoftCompDropShadow>(m_compositor.CreateDropShadow());
|
|
1825
|
+
return winrt::make<Composition::Experimental::MicrosoftCompDropShadow>(m_compositor.CreateDropShadow());
|
|
1805
1826
|
}
|
|
1806
1827
|
|
|
1807
|
-
winrt::Microsoft::ReactNative::Composition::IBrush CompContext<MicrosoftTypeRedirects>::CreateColorBrush(
|
|
1828
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IBrush CompContext<MicrosoftTypeRedirects>::CreateColorBrush(
|
|
1808
1829
|
winrt::Windows::UI::Color color) noexcept {
|
|
1809
|
-
return winrt::make<Composition::MicrosoftCompBrush>(m_compositor.CreateColorBrush(color));
|
|
1830
|
+
return winrt::make<Composition::Experimental::MicrosoftCompBrush>(m_compositor.CreateColorBrush(color));
|
|
1810
1831
|
}
|
|
1811
1832
|
|
|
1812
|
-
winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush
|
|
1833
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush
|
|
1813
1834
|
CompContext<MicrosoftTypeRedirects>::CreateDrawingSurfaceBrush(
|
|
1814
1835
|
winrt::Windows::Foundation::Size surfaceSize,
|
|
1815
1836
|
winrt::Windows::Graphics::DirectX::DirectXPixelFormat pixelFormat,
|
|
1816
1837
|
winrt::Windows::Graphics::DirectX::DirectXAlphaMode alphaMode) noexcept {
|
|
1817
|
-
return winrt::make<Composition::MicrosoftCompDrawingSurfaceBrush>(
|
|
1838
|
+
return winrt::make<Composition::Experimental::MicrosoftCompDrawingSurfaceBrush>(
|
|
1818
1839
|
m_compositor,
|
|
1819
1840
|
CompositionGraphicsDevice().CreateDrawingSurface(
|
|
1820
1841
|
surfaceSize,
|
|
@@ -1822,14 +1843,14 @@ CompContext<MicrosoftTypeRedirects>::CreateDrawingSurfaceBrush(
|
|
|
1822
1843
|
static_cast<winrt::Microsoft::Graphics::DirectX::DirectXAlphaMode>(alphaMode)));
|
|
1823
1844
|
}
|
|
1824
1845
|
|
|
1825
|
-
winrt::Microsoft::ReactNative::Composition::ICaretVisual
|
|
1846
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::ICaretVisual
|
|
1826
1847
|
CompContext<MicrosoftTypeRedirects>::CreateCaretVisual() noexcept {
|
|
1827
|
-
return winrt::make<Composition::MicrosoftCompCaretVisual>(m_compositor);
|
|
1848
|
+
return winrt::make<Composition::Experimental::MicrosoftCompCaretVisual>(m_compositor);
|
|
1828
1849
|
}
|
|
1829
1850
|
|
|
1830
|
-
winrt::Microsoft::ReactNative::Composition::IFocusVisual
|
|
1851
|
+
winrt::Microsoft::ReactNative::Composition::Experimental::IFocusVisual
|
|
1831
1852
|
CompContext<MicrosoftTypeRedirects>::CreateFocusVisual() noexcept {
|
|
1832
|
-
return winrt::make<Composition::MicrosoftCompFocusVisual>(m_compositor);
|
|
1853
|
+
return winrt::make<Composition::Experimental::MicrosoftCompFocusVisual>(m_compositor);
|
|
1833
1854
|
}
|
|
1834
1855
|
|
|
1835
1856
|
template <>
|
|
@@ -1845,19 +1866,19 @@ CompContext<MicrosoftTypeRedirects>::CompositionGraphicsDevice() noexcept {
|
|
|
1845
1866
|
using MicrosoftCompContext = CompContext<MicrosoftTypeRedirects>;
|
|
1846
1867
|
#endif
|
|
1847
1868
|
|
|
1848
|
-
} // namespace Microsoft::ReactNative::Composition
|
|
1869
|
+
} // namespace Microsoft::ReactNative::Composition::Experimental
|
|
1849
1870
|
|
|
1850
|
-
namespace winrt::Microsoft::ReactNative::Composition::implementation {
|
|
1871
|
+
namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation {
|
|
1851
1872
|
|
|
1852
1873
|
ICompositionContext SystemCompositionContextHelper::CreateContext(
|
|
1853
1874
|
winrt::Windows::UI::Composition::Compositor const &compositor) noexcept {
|
|
1854
|
-
return winrt::make<::Microsoft::ReactNative::Composition::WindowsCompContext>(compositor);
|
|
1875
|
+
return winrt::make<::Microsoft::ReactNative::Composition::Experimental::WindowsCompContext>(compositor);
|
|
1855
1876
|
}
|
|
1856
1877
|
|
|
1857
1878
|
IVisual SystemCompositionContextHelper::CreateVisual(winrt::Windows::UI::Composition::Visual const &visual) noexcept {
|
|
1858
1879
|
if (auto spriteVisual = visual.try_as<winrt::Windows::UI::Composition::SpriteVisual>())
|
|
1859
|
-
return winrt::make<::Microsoft::ReactNative::Composition::WindowsCompSpriteVisual>(spriteVisual);
|
|
1860
|
-
return winrt::make<::Microsoft::ReactNative::Composition::WindowsCompVisual>(visual);
|
|
1880
|
+
return winrt::make<::Microsoft::ReactNative::Composition::Experimental::WindowsCompSpriteVisual>(spriteVisual);
|
|
1881
|
+
return winrt::make<::Microsoft::ReactNative::Composition::Experimental::WindowsCompVisual>(visual);
|
|
1861
1882
|
}
|
|
1862
1883
|
|
|
1863
1884
|
winrt::Windows::UI::Composition::Compositor SystemCompositionContextHelper::InnerCompositor(
|
|
@@ -1896,14 +1917,14 @@ winrt::Windows::UI::Composition::ICompositionSurface SystemCompositionContextHel
|
|
|
1896
1917
|
#ifdef USE_WINUI3
|
|
1897
1918
|
ICompositionContext MicrosoftCompositionContextHelper::CreateContext(
|
|
1898
1919
|
winrt::Microsoft::UI::Composition::Compositor const &compositor) noexcept {
|
|
1899
|
-
return winrt::make<::Microsoft::ReactNative::Composition::MicrosoftCompContext>(compositor);
|
|
1920
|
+
return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompContext>(compositor);
|
|
1900
1921
|
}
|
|
1901
1922
|
|
|
1902
1923
|
IVisual MicrosoftCompositionContextHelper::CreateVisual(
|
|
1903
1924
|
winrt::Microsoft::UI::Composition::Visual const &visual) noexcept {
|
|
1904
1925
|
if (auto spriteVisual = visual.try_as<winrt::Microsoft::UI::Composition::SpriteVisual>())
|
|
1905
|
-
return winrt::make<::Microsoft::ReactNative::Composition::MicrosoftCompSpriteVisual>(spriteVisual);
|
|
1906
|
-
return winrt::make<::Microsoft::ReactNative::Composition::MicrosoftCompVisual>(visual);
|
|
1926
|
+
return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompSpriteVisual>(spriteVisual);
|
|
1927
|
+
return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompVisual>(visual);
|
|
1907
1928
|
}
|
|
1908
1929
|
|
|
1909
1930
|
winrt::Microsoft::UI::Composition::Compositor MicrosoftCompositionContextHelper::InnerCompositor(
|
|
@@ -1941,4 +1962,4 @@ winrt::Microsoft::UI::Composition::ICompositionSurface MicrosoftCompositionConte
|
|
|
1941
1962
|
}
|
|
1942
1963
|
#endif
|
|
1943
1964
|
|
|
1944
|
-
} // namespace winrt::Microsoft::ReactNative::Composition::implementation
|
|
1965
|
+
} // namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation
|