More InfoBarPanel API udpates (#3739)

ranjeshj · teaP · ranjeshj · commit 1d28ea2bb7a3 · 2020-12-02T16:51:56.000-08:00
* update API names

* update to use all the padding/margin properties

* Update for PR comments.

Co-authored-by: Tammy Paine &lt;30241445+teaP@users.noreply.github.com&gt;
diff --git a/dev/Generated/InfoBarPanel.properties.cpp b/dev/Generated/InfoBarPanel.properties.cpp
@@ -13,10 +13,10 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
 
 #include "InfoBarPanel.g.cpp"
 
-GlobalDependencyProperty InfoBarPanelProperties::s_PaddingInHorizontalOrientationProperty{ nullptr };
-GlobalDependencyProperty InfoBarPanelProperties::s_PaddingInVerticalOrientationProperty{ nullptr };
-GlobalDependencyProperty InfoBarPanelProperties::s_SpacingInHorizontalOrientationProperty{ nullptr };
-GlobalDependencyProperty InfoBarPanelProperties::s_SpacingInVerticalOrientationProperty{ nullptr };
+GlobalDependencyProperty InfoBarPanelProperties::s_HorizontalOrientationMarginProperty{ nullptr };
+GlobalDependencyProperty InfoBarPanelProperties::s_HorizontalOrientationPaddingProperty{ nullptr };
+GlobalDependencyProperty InfoBarPanelProperties::s_VerticalOrientationMarginProperty{ nullptr };
+GlobalDependencyProperty InfoBarPanelProperties::s_VerticalOrientationPaddingProperty{ nullptr };
 
 InfoBarPanelProperties::InfoBarPanelProperties()
 {
@@ -25,104 +25,104 @@ InfoBarPanelProperties::InfoBarPanelProperties()
 
 void InfoBarPanelProperties::EnsureProperties()
 {
-    if (!s_PaddingInHorizontalOrientationProperty)
+    if (!s_HorizontalOrientationMarginProperty)
     {
-        s_PaddingInHorizontalOrientationProperty =
+        s_HorizontalOrientationMarginProperty =
             InitializeDependencyProperty(
-                L"PaddingInHorizontalOrientation",
+                L"HorizontalOrientationMargin",
                 winrt::name_of<winrt::Thickness>(),
                 winrt::name_of<winrt::InfoBarPanel>(),
-                false /* isAttached */,
+                true /* isAttached */,
                 ValueHelper<winrt::Thickness>::BoxedDefaultValue(),
                 nullptr);
     }
-    if (!s_PaddingInVerticalOrientationProperty)
+    if (!s_HorizontalOrientationPaddingProperty)
     {
-        s_PaddingInVerticalOrientationProperty =
+        s_HorizontalOrientationPaddingProperty =
             InitializeDependencyProperty(
-                L"PaddingInVerticalOrientation",
+                L"HorizontalOrientationPadding",
                 winrt::name_of<winrt::Thickness>(),
                 winrt::name_of<winrt::InfoBarPanel>(),
                 false /* isAttached */,
                 ValueHelper<winrt::Thickness>::BoxedDefaultValue(),
                 nullptr);
     }
-    if (!s_SpacingInHorizontalOrientationProperty)
+    if (!s_VerticalOrientationMarginProperty)
     {
-        s_SpacingInHorizontalOrientationProperty =
+        s_VerticalOrientationMarginProperty =
             InitializeDependencyProperty(
-                L"SpacingInHorizontalOrientation",
+                L"VerticalOrientationMargin",
                 winrt::name_of<winrt::Thickness>(),
                 winrt::name_of<winrt::InfoBarPanel>(),
                 true /* isAttached */,
                 ValueHelper<winrt::Thickness>::BoxedDefaultValue(),
                 nullptr);
     }
-    if (!s_SpacingInVerticalOrientationProperty)
+    if (!s_VerticalOrientationPaddingProperty)
     {
-        s_SpacingInVerticalOrientationProperty =
+        s_VerticalOrientationPaddingProperty =
             InitializeDependencyProperty(
-                L"SpacingInVerticalOrientation",
+                L"VerticalOrientationPadding",
                 winrt::name_of<winrt::Thickness>(),
                 winrt::name_of<winrt::InfoBarPanel>(),
-                true /* isAttached */,
+                false /* isAttached */,
                 ValueHelper<winrt::Thickness>::BoxedDefaultValue(),
                 nullptr);
     }
 }
 
 void InfoBarPanelProperties::ClearProperties()
 {
-    s_PaddingInHorizontalOrientationProperty = nullptr;
-    s_PaddingInVerticalOrientationProperty = nullptr;
-    s_SpacingInHorizontalOrientationProperty = nullptr;
-    s_SpacingInVerticalOrientationProperty = nullptr;
+    s_HorizontalOrientationMarginProperty = nullptr;
+    s_HorizontalOrientationPaddingProperty = nullptr;
+    s_VerticalOrientationMarginProperty = nullptr;
+    s_VerticalOrientationPaddingProperty = nullptr;
 }
 
-void InfoBarPanelProperties::PaddingInHorizontalOrientation(winrt::Thickness const& value)
+
+void InfoBarPanelProperties::SetHorizontalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value)
 {
-    [[gsl::suppress(con)]]
-    {
-    static_cast<InfoBarPanel*>(this)->SetValue(s_PaddingInHorizontalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
-    }
+    target.SetValue(s_HorizontalOrientationMarginProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
 }
 
-winrt::Thickness InfoBarPanelProperties::PaddingInHorizontalOrientation()
+winrt::Thickness InfoBarPanelProperties::GetHorizontalOrientationMargin(winrt::DependencyObject const& target)
 {
-    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_PaddingInHorizontalOrientationProperty));
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_HorizontalOrientationMarginProperty));
 }
 
-void InfoBarPanelProperties::PaddingInVerticalOrientation(winrt::Thickness const& value)
+void InfoBarPanelProperties::HorizontalOrientationPadding(winrt::Thickness const& value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<InfoBarPanel*>(this)->SetValue(s_PaddingInVerticalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    static_cast<InfoBarPanel*>(this)->SetValue(s_HorizontalOrientationPaddingProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
     }
 }
 
-winrt::Thickness InfoBarPanelProperties::PaddingInVerticalOrientation()
+winrt::Thickness InfoBarPanelProperties::HorizontalOrientationPadding()
 {
-    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_PaddingInVerticalOrientationProperty));
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_HorizontalOrientationPaddingProperty));
 }
 
 
-void InfoBarPanelProperties::SetSpacingInHorizontalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value)
+void InfoBarPanelProperties::SetVerticalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value)
 {
-    target.SetValue(s_SpacingInHorizontalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    target.SetValue(s_VerticalOrientationMarginProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
 }
 
-winrt::Thickness InfoBarPanelProperties::GetSpacingInHorizontalOrientation(winrt::DependencyObject const& target)
+winrt::Thickness InfoBarPanelProperties::GetVerticalOrientationMargin(winrt::DependencyObject const& target)
 {
-    return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_SpacingInHorizontalOrientationProperty));
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_VerticalOrientationMarginProperty));
 }
 
-
-void InfoBarPanelProperties::SetSpacingInVerticalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value)
+void InfoBarPanelProperties::VerticalOrientationPadding(winrt::Thickness const& value)
 {
-    target.SetValue(s_SpacingInVerticalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    [[gsl::suppress(con)]]
+    {
+    static_cast<InfoBarPanel*>(this)->SetValue(s_VerticalOrientationPaddingProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));
+    }
 }
 
-winrt::Thickness InfoBarPanelProperties::GetSpacingInVerticalOrientation(winrt::DependencyObject const& target)
+winrt::Thickness InfoBarPanelProperties::VerticalOrientationPadding()
 {
-    return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_SpacingInVerticalOrientationProperty));
+    return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_VerticalOrientationPaddingProperty));
 }
diff --git a/dev/Generated/InfoBarPanel.properties.h b/dev/Generated/InfoBarPanel.properties.h
@@ -9,27 +9,27 @@ class InfoBarPanelProperties
 public:
     InfoBarPanelProperties();
 
-    void PaddingInHorizontalOrientation(winrt::Thickness const& value);
-    winrt::Thickness PaddingInHorizontalOrientation();
+    static void SetHorizontalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value);
+    static winrt::Thickness GetHorizontalOrientationMargin(winrt::DependencyObject const& target);
 
-    void PaddingInVerticalOrientation(winrt::Thickness const& value);
-    winrt::Thickness PaddingInVerticalOrientation();
+    void HorizontalOrientationPadding(winrt::Thickness const& value);
+    winrt::Thickness HorizontalOrientationPadding();
 
-    static void SetSpacingInHorizontalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value);
-    static winrt::Thickness GetSpacingInHorizontalOrientation(winrt::DependencyObject const& target);
+    static void SetVerticalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value);
+    static winrt::Thickness GetVerticalOrientationMargin(winrt::DependencyObject const& target);
 
-    static void SetSpacingInVerticalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value);
-    static winrt::Thickness GetSpacingInVerticalOrientation(winrt::DependencyObject const& target);
+    void VerticalOrientationPadding(winrt::Thickness const& value);
+    winrt::Thickness VerticalOrientationPadding();
 
-    static winrt::DependencyProperty PaddingInHorizontalOrientationProperty() { return s_PaddingInHorizontalOrientationProperty; }
-    static winrt::DependencyProperty PaddingInVerticalOrientationProperty() { return s_PaddingInVerticalOrientationProperty; }
-    static winrt::DependencyProperty SpacingInHorizontalOrientationProperty() { return s_SpacingInHorizontalOrientationProperty; }
-    static winrt::DependencyProperty SpacingInVerticalOrientationProperty() { return s_SpacingInVerticalOrientationProperty; }
+    static winrt::DependencyProperty HorizontalOrientationMarginProperty() { return s_HorizontalOrientationMarginProperty; }
+    static winrt::DependencyProperty HorizontalOrientationPaddingProperty() { return s_HorizontalOrientationPaddingProperty; }
+    static winrt::DependencyProperty VerticalOrientationMarginProperty() { return s_VerticalOrientationMarginProperty; }
+    static winrt::DependencyProperty VerticalOrientationPaddingProperty() { return s_VerticalOrientationPaddingProperty; }
 
-    static GlobalDependencyProperty s_PaddingInHorizontalOrientationProperty;
-    static GlobalDependencyProperty s_PaddingInVerticalOrientationProperty;
-    static GlobalDependencyProperty s_SpacingInHorizontalOrientationProperty;
-    static GlobalDependencyProperty s_SpacingInVerticalOrientationProperty;
+    static GlobalDependencyProperty s_HorizontalOrientationMarginProperty;
+    static GlobalDependencyProperty s_HorizontalOrientationPaddingProperty;
+    static GlobalDependencyProperty s_VerticalOrientationMarginProperty;
+    static GlobalDependencyProperty s_VerticalOrientationPaddingProperty;
 
     static void EnsureProperties();
     static void ClearProperties();
diff --git a/dev/InfoBar/InfoBar.idl b/dev/InfoBar/InfoBar.idl
@@ -117,19 +117,19 @@ unsealed runtimeclass InfoBarPanel : Windows.UI.Xaml.Controls.Panel
 {
     InfoBarPanel();
 
-    Windows.UI.Xaml.Thickness PaddingInHorizontalOrientation;
-    static Windows.UI.Xaml.DependencyProperty PaddingInHorizontalOrientationProperty{ get; };
+    Windows.UI.Xaml.Thickness HorizontalOrientationPadding;
+    static Windows.UI.Xaml.DependencyProperty HorizontalOrientationPaddingProperty{ get; };
 
-    Windows.UI.Xaml.Thickness PaddingInVerticalOrientation;
-    static Windows.UI.Xaml.DependencyProperty PaddingInVerticalOrientationProperty{ get; };
+    Windows.UI.Xaml.Thickness VerticalOrientationPadding;
+    static Windows.UI.Xaml.DependencyProperty VerticalOrientationPaddingProperty{ get; };
 
-    static void SetSpacingInHorizontalOrientation(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value);
-    static Windows.UI.Xaml.Thickness GetSpacingInHorizontalOrientation(Windows.UI.Xaml.DependencyObject object);
-    static Windows.UI.Xaml.DependencyProperty SpacingInHorizontalOrientationProperty{ get; };
+    static void SetHorizontalOrientationMargin(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value);
+    static Windows.UI.Xaml.Thickness GetHorizontalOrientationMargin(Windows.UI.Xaml.DependencyObject object);
+    static Windows.UI.Xaml.DependencyProperty HorizontalOrientationMarginProperty{ get; };
 
-    static void SetSpacingInVerticalOrientation(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value);
-    static Windows.UI.Xaml.Thickness GetSpacingInVerticalOrientation(Windows.UI.Xaml.DependencyObject object);
-    static Windows.UI.Xaml.DependencyProperty SpacingInVerticalOrientationProperty{ get; };
+    static void SetVerticalOrientationMargin(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value);
+    static Windows.UI.Xaml.Thickness GetVerticalOrientationMargin(Windows.UI.Xaml.DependencyObject object);
+    static Windows.UI.Xaml.DependencyProperty VerticalOrientationMarginProperty{ get; };
 }
 
 }
diff --git a/dev/InfoBar/InfoBar.xaml b/dev/InfoBar/InfoBar.xaml
@@ -136,14 +136,14 @@
                             <primitives:InfoBarPanel
                                 Grid.Column="1"
                                 Margin="{StaticResource InfoBarPanelMargin}"
-                                PaddingInHorizontalOrientation="{StaticResource InfoBarPanelPaddingInHorizontalOrientation}"
-                                PaddingInVerticalOrientation="{StaticResource InfoBarPanelPaddingInVerticalOrientation}">
+                                HorizontalOrientationPadding="{StaticResource InfoBarPanelHorizontalOrientationPadding}"
+                                VerticalOrientationPadding="{StaticResource InfoBarPanelVerticalOrientationPadding}">
 
                                 <TextBlock x:Name="Title"
                                     Text="{TemplateBinding Title}"
                                     Foreground="{ThemeResource InfoBarTitleForeground}"
-                                    primitives:InfoBarPanel.SpacingInHorizontalOrientation="{StaticResource InfoBarTitleSpacingInHorizontalOrientation}"
-                                    primitives:InfoBarPanel.SpacingInVerticalOrientation="{StaticResource InfoBarTitleSpacingInVerticalOrientation}"
+                                    primitives:InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarTitleHorizontalOrientationMargin}"
+                                    primitives:InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarTitleVerticalOrientationMargin}"
                                     TextWrapping="WrapWholeWords"
                                     AutomationProperties.LandmarkType="Navigation"
                                     FontWeight="{StaticResource InfoBarTitleFontWeight}"
@@ -152,15 +152,15 @@
                                 <TextBlock x:Name="Message" 
                                     Text="{TemplateBinding Message}"
                                     Foreground="{ThemeResource InfoBarMessageForeground}"
-                                    primitives:InfoBarPanel.SpacingInHorizontalOrientation="{StaticResource InfoBarMessageSpacingInHorizontalOrientation}"
-                                    primitives:InfoBarPanel.SpacingInVerticalOrientation="{StaticResource InfoBarMessageSpacingInVerticalOrientation}"
+                                    primitives:InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarMessageHorizontalOrientationMargin}"
+                                    primitives:InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarMessageVerticalOrientationMargin}"
                                     TextWrapping="WrapWholeWords"
                                     FontWeight="{StaticResource InfoBarMessageFontWeight}"
                                     FontSize="{StaticResource InfoBarMessageFontSize}"/>
 
                                 <ContentPresenter
-                                    primitives:InfoBarPanel.SpacingInHorizontalOrientation="{StaticResource InfoBarActionSpacingInHorizontalOrientation}"
-                                    primitives:InfoBarPanel.SpacingInVerticalOrientation="{StaticResource InfoBarActionSpacingInVerticalOrientation}"
+                                    primitives:InfoBarPanel.HorizontalOrientationMargin="{StaticResource InfoBarActionHorizontalOrientationMargin}"
+                                    primitives:InfoBarPanel.VerticalOrientationMargin="{StaticResource InfoBarActionVerticalOrientationMargin}"
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding ActionButton}">
                                     
diff --git a/dev/InfoBar/InfoBarPanel.cpp b/dev/InfoBar/InfoBarPanel.cpp
diff --git a/dev/InfoBar/InfoBar_themeresources.xaml b/dev/InfoBar/InfoBar_themeresources.xaml

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Primitives`
`13`	`13`
`14`	`14`	`#include "InfoBarPanel.g.cpp"`
`15`	`15`
`16`		`-GlobalDependencyProperty InfoBarPanelProperties::s_PaddingInHorizontalOrientationProperty{ nullptr };`
`17`		`-GlobalDependencyProperty InfoBarPanelProperties::s_PaddingInVerticalOrientationProperty{ nullptr };`
`18`		`-GlobalDependencyProperty InfoBarPanelProperties::s_SpacingInHorizontalOrientationProperty{ nullptr };`
`19`		`-GlobalDependencyProperty InfoBarPanelProperties::s_SpacingInVerticalOrientationProperty{ nullptr };`
	`16`	`+GlobalDependencyProperty InfoBarPanelProperties::s_HorizontalOrientationMarginProperty{ nullptr };`
	`17`	`+GlobalDependencyProperty InfoBarPanelProperties::s_HorizontalOrientationPaddingProperty{ nullptr };`
	`18`	`+GlobalDependencyProperty InfoBarPanelProperties::s_VerticalOrientationMarginProperty{ nullptr };`
	`19`	`+GlobalDependencyProperty InfoBarPanelProperties::s_VerticalOrientationPaddingProperty{ nullptr };`
`20`	`20`
`21`	`21`	`InfoBarPanelProperties::InfoBarPanelProperties()`
`22`	`22`	`{`
`@@ -25,104 +25,104 @@ InfoBarPanelProperties::InfoBarPanelProperties()`
`25`	`25`
`26`	`26`	`void InfoBarPanelProperties::EnsureProperties()`
`27`	`27`	`{`
`28`		`- if (!s_PaddingInHorizontalOrientationProperty)`
	`28`	`+ if (!s_HorizontalOrientationMarginProperty)`
`29`	`29`	`{`
`30`		`- s_PaddingInHorizontalOrientationProperty =`
	`30`	`+ s_HorizontalOrientationMarginProperty =`
`31`	`31`	`InitializeDependencyProperty(`
`32`		`- L"PaddingInHorizontalOrientation",`
	`32`	`+ L"HorizontalOrientationMargin",`
`33`	`33`	`winrt::name_of<winrt::Thickness>(),`
`34`	`34`	`winrt::name_of<winrt::InfoBarPanel>(),`
`35`		`- false /* isAttached */,`
	`35`	`+ true /* isAttached */,`
`36`	`36`	`ValueHelper<winrt::Thickness>::BoxedDefaultValue(),`
`37`	`37`	`nullptr);`
`38`	`38`	`}`
`39`		`- if (!s_PaddingInVerticalOrientationProperty)`
	`39`	`+ if (!s_HorizontalOrientationPaddingProperty)`
`40`	`40`	`{`
`41`		`- s_PaddingInVerticalOrientationProperty =`
	`41`	`+ s_HorizontalOrientationPaddingProperty =`
`42`	`42`	`InitializeDependencyProperty(`
`43`		`- L"PaddingInVerticalOrientation",`
	`43`	`+ L"HorizontalOrientationPadding",`
`44`	`44`	`winrt::name_of<winrt::Thickness>(),`
`45`	`45`	`winrt::name_of<winrt::InfoBarPanel>(),`
`46`	`46`	`false /* isAttached */,`
`47`	`47`	`ValueHelper<winrt::Thickness>::BoxedDefaultValue(),`
`48`	`48`	`nullptr);`
`49`	`49`	`}`
`50`		`- if (!s_SpacingInHorizontalOrientationProperty)`
	`50`	`+ if (!s_VerticalOrientationMarginProperty)`
`51`	`51`	`{`
`52`		`- s_SpacingInHorizontalOrientationProperty =`
	`52`	`+ s_VerticalOrientationMarginProperty =`
`53`	`53`	`InitializeDependencyProperty(`
`54`		`- L"SpacingInHorizontalOrientation",`
	`54`	`+ L"VerticalOrientationMargin",`
`55`	`55`	`winrt::name_of<winrt::Thickness>(),`
`56`	`56`	`winrt::name_of<winrt::InfoBarPanel>(),`
`57`	`57`	`true /* isAttached */,`
`58`	`58`	`ValueHelper<winrt::Thickness>::BoxedDefaultValue(),`
`59`	`59`	`nullptr);`
`60`	`60`	`}`
`61`		`- if (!s_SpacingInVerticalOrientationProperty)`
	`61`	`+ if (!s_VerticalOrientationPaddingProperty)`
`62`	`62`	`{`
`63`		`- s_SpacingInVerticalOrientationProperty =`
	`63`	`+ s_VerticalOrientationPaddingProperty =`
`64`	`64`	`InitializeDependencyProperty(`
`65`		`- L"SpacingInVerticalOrientation",`
	`65`	`+ L"VerticalOrientationPadding",`
`66`	`66`	`winrt::name_of<winrt::Thickness>(),`
`67`	`67`	`winrt::name_of<winrt::InfoBarPanel>(),`
`68`		`- true /* isAttached */,`
	`68`	`+ false /* isAttached */,`
`69`	`69`	`ValueHelper<winrt::Thickness>::BoxedDefaultValue(),`
`70`	`70`	`nullptr);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void InfoBarPanelProperties::ClearProperties()`
`75`	`75`	`{`
`76`		`- s_PaddingInHorizontalOrientationProperty = nullptr;`
`77`		`- s_PaddingInVerticalOrientationProperty = nullptr;`
`78`		`- s_SpacingInHorizontalOrientationProperty = nullptr;`
`79`		`- s_SpacingInVerticalOrientationProperty = nullptr;`
	`76`	`+ s_HorizontalOrientationMarginProperty = nullptr;`
	`77`	`+ s_HorizontalOrientationPaddingProperty = nullptr;`
	`78`	`+ s_VerticalOrientationMarginProperty = nullptr;`
	`79`	`+ s_VerticalOrientationPaddingProperty = nullptr;`
`80`	`80`	`}`
`81`	`81`
`82`		`-void InfoBarPanelProperties::PaddingInHorizontalOrientation(winrt::Thickness const& value)`
	`82`	`+`
	`83`	`+void InfoBarPanelProperties::SetHorizontalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value)`
`83`	`84`	`{`
`84`		`- [[gsl::suppress(con)]]`
`85`		`- {`
`86`		`- static_cast<InfoBarPanel*>(this)->SetValue(s_PaddingInHorizontalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
`87`		`- }`
	`85`	`+ target.SetValue(s_HorizontalOrientationMarginProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
`88`	`86`	`}`
`89`	`87`
`90`		`-winrt::Thickness InfoBarPanelProperties::PaddingInHorizontalOrientation()`
	`88`	`+winrt::Thickness InfoBarPanelProperties::GetHorizontalOrientationMargin(winrt::DependencyObject const& target)`
`91`	`89`	`{`
`92`		`- return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_PaddingInHorizontalOrientationProperty));`
	`90`	`+ return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_HorizontalOrientationMarginProperty));`
`93`	`91`	`}`
`94`	`92`
`95`		`-void InfoBarPanelProperties::PaddingInVerticalOrientation(winrt::Thickness const& value)`
	`93`	`+void InfoBarPanelProperties::HorizontalOrientationPadding(winrt::Thickness const& value)`
`96`	`94`	`{`
`97`	`95`	`[[gsl::suppress(con)]]`
`98`	`96`	`{`
`99`		`- static_cast<InfoBarPanel*>(this)->SetValue(s_PaddingInVerticalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
	`97`	`+ static_cast<InfoBarPanel*>(this)->SetValue(s_HorizontalOrientationPaddingProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
`100`	`98`	`}`
`101`	`99`	`}`
`102`	`100`
`103`		`-winrt::Thickness InfoBarPanelProperties::PaddingInVerticalOrientation()`
	`101`	`+winrt::Thickness InfoBarPanelProperties::HorizontalOrientationPadding()`
`104`	`102`	`{`
`105`		`- return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_PaddingInVerticalOrientationProperty));`
	`103`	`+ return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_HorizontalOrientationPaddingProperty));`
`106`	`104`	`}`
`107`	`105`
`108`	`106`
`109`		`-void InfoBarPanelProperties::SetSpacingInHorizontalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value)`
	`107`	`+void InfoBarPanelProperties::SetVerticalOrientationMargin(winrt::DependencyObject const& target, winrt::Thickness const& value)`
`110`	`108`	`{`
`111`		`- target.SetValue(s_SpacingInHorizontalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
	`109`	`+ target.SetValue(s_VerticalOrientationMarginProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
`112`	`110`	`}`
`113`	`111`
`114`		`-winrt::Thickness InfoBarPanelProperties::GetSpacingInHorizontalOrientation(winrt::DependencyObject const& target)`
	`112`	`+winrt::Thickness InfoBarPanelProperties::GetVerticalOrientationMargin(winrt::DependencyObject const& target)`
`115`	`113`	`{`
`116`		`- return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_SpacingInHorizontalOrientationProperty));`
	`114`	`+ return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_VerticalOrientationMarginProperty));`
`117`	`115`	`}`
`118`	`116`
`119`		`-`
`120`		`-void InfoBarPanelProperties::SetSpacingInVerticalOrientation(winrt::DependencyObject const& target, winrt::Thickness const& value)`
	`117`	`+void InfoBarPanelProperties::VerticalOrientationPadding(winrt::Thickness const& value)`
`121`	`118`	`{`
`122`		`- target.SetValue(s_SpacingInVerticalOrientationProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
	`119`	`+ [[gsl::suppress(con)]]`
	`120`	`+ {`
	`121`	`+ static_cast<InfoBarPanel*>(this)->SetValue(s_VerticalOrientationPaddingProperty, ValueHelper<winrt::Thickness>::BoxValueIfNecessary(value));`
	`122`	`+ }`
`123`	`123`	`}`
`124`	`124`
`125`		`-winrt::Thickness InfoBarPanelProperties::GetSpacingInVerticalOrientation(winrt::DependencyObject const& target)`
	`125`	`+winrt::Thickness InfoBarPanelProperties::VerticalOrientationPadding()`
`126`	`126`	`{`
`127`		`- return ValueHelper<winrt::Thickness>::CastOrUnbox(target.GetValue(s_SpacingInVerticalOrientationProperty));`
	`127`	`+ return ValueHelper<winrt::Thickness>::CastOrUnbox(static_cast<InfoBarPanel*>(this)->GetValue(s_VerticalOrientationPaddingProperty));`
`128`	`128`	`}`