Merged PR 14427705: Update WrapPanel properties to align to released LinedFlowLayout, see discussion #10858

Syncing content from committish 718be114ad87e2aeec1a7ad95aacaef3bb32f689

Author: reunion-maestro-bot

src/controls/dev/Generated/WrapPanel.properties.cpp

@@ -13,11 +13,11 @@ namespace winrt::Microsoft::UI::Xaml::Controls
 
 #include "WrapPanel.g.cpp"
 
-GlobalDependencyProperty WrapPanelProperties::s_HorizontalSpacingProperty{ nullptr };
+GlobalDependencyProperty WrapPanelProperties::s_ItemSpacingProperty{ nullptr };
+GlobalDependencyProperty WrapPanelProperties::s_ItemsStretchProperty{ nullptr };
+GlobalDependencyProperty WrapPanelProperties::s_LineSpacingProperty{ nullptr };
 GlobalDependencyProperty WrapPanelProperties::s_OrientationProperty{ nullptr };
 GlobalDependencyProperty WrapPanelProperties::s_PaddingProperty{ nullptr };
-GlobalDependencyProperty WrapPanelProperties::s_StretchChildProperty{ nullptr };
-GlobalDependencyProperty WrapPanelProperties::s_VerticalSpacingProperty{ nullptr };
 
 WrapPanelProperties::WrapPanelProperties()
 {
@@ -26,16 +26,38 @@ WrapPanelProperties::WrapPanelProperties()
 
 void WrapPanelProperties::EnsureProperties()
 {
-    if (!s_HorizontalSpacingProperty)
+    if (!s_ItemSpacingProperty)
     {
-        s_HorizontalSpacingProperty =
+        s_ItemSpacingProperty =
             InitializeDependencyProperty(
-                L"HorizontalSpacing",
+                L"ItemSpacing",
                 winrt::name_of<double>(),
                 winrt::name_of<winrt::WrapPanel>(),
                 false /* isAttached */,
                 ValueHelper<double>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnHorizontalSpacingPropertyChanged));
+                winrt::PropertyChangedCallback(&OnItemSpacingPropertyChanged));
+    }
+    if (!s_ItemsStretchProperty)
+    {
+        s_ItemsStretchProperty =
+            InitializeDependencyProperty(
+                L"ItemsStretch",
+                winrt::name_of<winrt::WrapPanelItemsStretch>(),
+                winrt::name_of<winrt::WrapPanel>(),
+                false /* isAttached */,
+                ValueHelper<winrt::WrapPanelItemsStretch>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnItemsStretchPropertyChanged));
+    }
+    if (!s_LineSpacingProperty)
+    {
+        s_LineSpacingProperty =
+            InitializeDependencyProperty(
+                L"LineSpacing",
+                winrt::name_of<double>(),
+                winrt::name_of<winrt::WrapPanel>(),
+                false /* isAttached */,
+                ValueHelper<double>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnLineSpacingPropertyChanged));
     }
     if (!s_OrientationProperty)
     {
@@ -59,140 +81,118 @@ void WrapPanelProperties::EnsureProperties()
                 ValueHelper<winrt::Thickness>::BoxedDefaultValue(),
                 winrt::PropertyChangedCallback(&OnPaddingPropertyChanged));
     }
-    if (!s_StretchChildProperty)
-    {
-        s_StretchChildProperty =
-            InitializeDependencyProperty(
-                L"StretchChild",
-                winrt::name_of<winrt::StretchChild>(),
-                winrt::name_of<winrt::WrapPanel>(),
-                false /* isAttached */,
-                ValueHelper<winrt::StretchChild>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnStretchChildPropertyChanged));
-    }
-    if (!s_VerticalSpacingProperty)
-    {
-        s_VerticalSpacingProperty =
-            InitializeDependencyProperty(
-                L"VerticalSpacing",
-                winrt::name_of<double>(),
-                winrt::name_of<winrt::WrapPanel>(),
-                false /* isAttached */,
-                ValueHelper<double>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnVerticalSpacingPropertyChanged));
-    }
 }
 
 void WrapPanelProperties::ClearProperties()
 {
-    s_HorizontalSpacingProperty = nullptr;
+    s_ItemSpacingProperty = nullptr;
+    s_ItemsStretchProperty = nullptr;
+    s_LineSpacingProperty = nullptr;
     s_OrientationProperty = nullptr;
     s_PaddingProperty = nullptr;
-    s_StretchChildProperty = nullptr;
-    s_VerticalSpacingProperty = nullptr;
 }
 
-void WrapPanelProperties::OnHorizontalSpacingPropertyChanged(
+void WrapPanelProperties::OnItemSpacingPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
 {
     auto owner = sender.as<winrt::WrapPanel>();
     winrt::get_self<WrapPanel>(owner)->OnPropertyChanged(args);
 }
 
-void WrapPanelProperties::OnOrientationPropertyChanged(
+void WrapPanelProperties::OnItemsStretchPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
 {
     auto owner = sender.as<winrt::WrapPanel>();
     winrt::get_self<WrapPanel>(owner)->OnPropertyChanged(args);
 }
 
-void WrapPanelProperties::OnPaddingPropertyChanged(
+void WrapPanelProperties::OnLineSpacingPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
 {
     auto owner = sender.as<winrt::WrapPanel>();
     winrt::get_self<WrapPanel>(owner)->OnPropertyChanged(args);
 }
 
-void WrapPanelProperties::OnStretchChildPropertyChanged(
+void WrapPanelProperties::OnOrientationPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
 {
     auto owner = sender.as<winrt::WrapPanel>();
     winrt::get_self<WrapPanel>(owner)->OnPropertyChanged(args);
 }
 
-void WrapPanelProperties::OnVerticalSpacingPropertyChanged(
+void WrapPanelProperties::OnPaddingPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
 {
     auto owner = sender.as<winrt::WrapPanel>();
     winrt::get_self<WrapPanel>(owner)->OnPropertyChanged(args);
 }
 
-void WrapPanelProperties::HorizontalSpacing(double value)
+void WrapPanelProperties::ItemSpacing(double value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<WrapPanel*>(this)->SetValue(s_HorizontalSpacingProperty, ValueHelper<double>::BoxValueIfNecessary(value));
+    static_cast<WrapPanel*>(this)->SetValue(s_ItemSpacingProperty, ValueHelper<double>::BoxValueIfNecessary(value));
     }
 }
 
-double WrapPanelProperties::HorizontalSpacing()
+double WrapPanelProperties::ItemSpacing()
 {
-    return ValueHelper<double>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_HorizontalSpacingProperty));
+    return ValueHelper<double>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_ItemSpacingProperty));
 }
 
-void WrapPanelProperties::Orientation(winrt::Orientation const& value)
+void WrapPanelProperties::ItemsStretch(winrt::WrapPanelItemsStretch const& value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<WrapPanel*>(this)->SetValue(s_OrientationProperty, ValueHelper<winrt::Orientation>::BoxValueIfNecessary(value));
+    static_cast<WrapPanel*>(this)->SetValue(s_ItemsStretchProperty, ValueHelper<winrt::WrapPanelItemsStretch>::BoxValueIfNecessary(value));
     }
 }
 
-winrt::Orientation WrapPanelProperties::Orientation()
+winrt::WrapPanelItemsStretch WrapPanelProperties::ItemsStretch()
 {
-    return ValueHelper<winrt::Orientation>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_OrientationProperty));
+    return ValueHelper<winrt::WrapPanelItemsStretch>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_ItemsStretchProperty));
 }
 
-void WrapPanelProperties::Padding(winrt::Thickness const& value)
+void WrapPanelProperties::LineSpacing(double value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<WrapPanel*>(this)->SetValue(s_PaddingProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    static_cast<WrapPanel*>(this)->SetValue(s_LineSpacingProperty, ValueHelper<double>::BoxValueIfNecessary(value));
     }
 }
 
-winrt::Thickness WrapPanelProperties::Padding()
+double WrapPanelProperties::LineSpacing()
 {
-    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_PaddingProperty));
+    return ValueHelper<double>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_LineSpacingProperty));
 }
 
-void WrapPanelProperties::StretchChild(winrt::StretchChild const& value)
+void WrapPanelProperties::Orientation(winrt::Orientation const& value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<WrapPanel*>(this)->SetValue(s_StretchChildProperty, ValueHelper<winrt::StretchChild>::BoxValueIfNecessary(value));
+    static_cast<WrapPanel*>(this)->SetValue(s_OrientationProperty, ValueHelper<winrt::Orientation>::BoxValueIfNecessary(value));
     }
 }
 
-winrt::StretchChild WrapPanelProperties::StretchChild()
+winrt::Orientation WrapPanelProperties::Orientation()
 {
-    return ValueHelper<winrt::StretchChild>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_StretchChildProperty));
+    return ValueHelper<winrt::Orientation>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_OrientationProperty));
 }
 
-void WrapPanelProperties::VerticalSpacing(double value)
+void WrapPanelProperties::Padding(winrt::Thickness const& value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<WrapPanel*>(this)->SetValue(s_VerticalSpacingProperty, ValueHelper<double>::BoxValueIfNecessary(value));
+    static_cast<WrapPanel*>(this)->SetValue(s_PaddingProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
     }
 }
 
-double WrapPanelProperties::VerticalSpacing()
+winrt::Thickness WrapPanelProperties::Padding()
 {
-    return ValueHelper<double>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_VerticalSpacingProperty));
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<WrapPanel*>(this)->GetValue(s_PaddingProperty));
 }

src/controls/dev/Generated/WrapPanel.properties.h

@@ -9,53 +9,53 @@ class WrapPanelProperties
 public:
     WrapPanelProperties();
 
-    void HorizontalSpacing(double value);
-    double HorizontalSpacing();
+    void ItemSpacing(double value);
+    double ItemSpacing();
+
+    void ItemsStretch(winrt::WrapPanelItemsStretch const& value);
+    winrt::WrapPanelItemsStretch ItemsStretch();
+
+    void LineSpacing(double value);
+    double LineSpacing();
 
     void Orientation(winrt::Orientation const& value);
     winrt::Orientation Orientation();
 
     void Padding(winrt::Thickness const& value);
     winrt::Thickness Padding();
 
-    void StretchChild(winrt::StretchChild const& value);
-    winrt::StretchChild StretchChild();
-
-    void VerticalSpacing(double value);
-    double VerticalSpacing();
-
-    static winrt::DependencyProperty HorizontalSpacingProperty() { return s_HorizontalSpacingProperty; }
+    static winrt::DependencyProperty ItemSpacingProperty() { return s_ItemSpacingProperty; }
+    static winrt::DependencyProperty ItemsStretchProperty() { return s_ItemsStretchProperty; }
+    static winrt::DependencyProperty LineSpacingProperty() { return s_LineSpacingProperty; }
     static winrt::DependencyProperty OrientationProperty() { return s_OrientationProperty; }
     static winrt::DependencyProperty PaddingProperty() { return s_PaddingProperty; }
-    static winrt::DependencyProperty StretchChildProperty() { return s_StretchChildProperty; }
-    static winrt::DependencyProperty VerticalSpacingProperty() { return s_VerticalSpacingProperty; }
 
-    static GlobalDependencyProperty s_HorizontalSpacingProperty;
+    static GlobalDependencyProperty s_ItemSpacingProperty;
+    static GlobalDependencyProperty s_ItemsStretchProperty;
+    static GlobalDependencyProperty s_LineSpacingProperty;
     static GlobalDependencyProperty s_OrientationProperty;
     static GlobalDependencyProperty s_PaddingProperty;
-    static GlobalDependencyProperty s_StretchChildProperty;
-    static GlobalDependencyProperty s_VerticalSpacingProperty;
 
     static void EnsureProperties();
     static void ClearProperties();
 
-    static void OnHorizontalSpacingPropertyChanged(
+    static void OnItemSpacingPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
-    static void OnOrientationPropertyChanged(
+    static void OnItemsStretchPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
-    static void OnPaddingPropertyChanged(
+    static void OnLineSpacingPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
-    static void OnStretchChildPropertyChanged(
+    static void OnOrientationPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
-    static void OnVerticalSpacingPropertyChanged(
+    static void OnPaddingPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 };