UWP - Add new property to the renderer (#8806)

microsoft · Feb 1, 2024 · 913e034 · 913e034
1 parent 608e213
commit 913e034
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 20 deletions.
diff --git a/source/uwp/Renderer/idl/AdaptiveCards.Rendering.Uwp.idl b/source/uwp/Renderer/idl/AdaptiveCards.Rendering.Uwp.idl
@@ -54,6 +54,8 @@ namespace AdaptiveCards
                 String OverflowButtonText;
                 String OverflowButtonAccessibilityText;
 
+                Boolean AddSelectActionMargin;
+
                 void SetFixedDimensions(UInt32 desiredWidth, UInt32 desiredHeight);
                 void ResetFixedDimensions();
 

diff --git a/source/uwp/SharedRenderer/lib/ActionHelpers.cpp b/source/uwp/SharedRenderer/lib/ActionHelpers.cpp
@@ -509,31 +509,37 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers
         auto button = CreateButton(action);
         button.Content(elementToWrap);
 
-        uint32_t cardPadding = 0;
-        if (fullWidth)
-        {
-            cardPadding = hostConfig.Spacing().Padding();
-        }
+        auto hostConfigImpl = peek_innards<winrt::implementation::AdaptiveHostConfig>(hostConfig);
+        auto addSelectActionMargin = hostConfigImpl->AddSelectActionMargin();
 
-        // We want the hit target to equally split the vertical space above and below the current item.
-        // However, all we know is the spacing of the current item, which only applies to the spacing above.
-        // We don't know what the spacing of the NEXT element will be, so we can't calculate the correct spacing
-        // below. For now, we'll simply assume the bottom spacing is the same as the top. NOTE: Only apply spacings
-        // (padding, margin) for adaptive card elements to avoid adding spacings to card-level selectAction.
-        if (adaptiveCardElement)
+        if (addSelectActionMargin)
         {
-            auto elementSpacing = adaptiveCardElement.Spacing();
-            uint32_t spacingSize = GetSpacingSizeFromSpacing(hostConfig, elementSpacing);
+            uint32_t cardPadding = 0;
+            if (fullWidth)
+            {
+                cardPadding = hostConfig.Spacing().Padding();
+            }
+
+            // We want the hit target to equally split the vertical space above and below the current item.
+            // However, all we know is the spacing of the current item, which only applies to the spacing above.
+            // We don't know what the spacing of the NEXT element will be, so we can't calculate the correct spacing
+            // below. For now, we'll simply assume the bottom spacing is the same as the top. NOTE: Only apply spacings
+            // (padding, margin) for adaptive card elements to avoid adding spacings to card-level selectAction.
+            if (adaptiveCardElement)
+            {
+                auto elementSpacing = adaptiveCardElement.Spacing();
+                uint32_t spacingSize = GetSpacingSizeFromSpacing(hostConfig, elementSpacing);
 
-            double topBottomPadding = spacingSize / 2.0;
+                double topBottomPadding = spacingSize / 2.0;
 
-            // For button padding, we apply the cardPadding and topBottomPadding (and then we negate these in the margin)
-            button.Padding({(double)cardPadding, topBottomPadding, (double)cardPadding, topBottomPadding});
+                // For button padding, we apply the cardPadding and topBottomPadding (and then we negate these in the margin)
+                button.Padding({(double)cardPadding, topBottomPadding, (double)cardPadding, topBottomPadding});
 
-            double negativeCardMargin = cardPadding * -1.0;
-            double negativeTopBottomMargin = topBottomPadding * -1.0;
+                double negativeCardMargin = cardPadding * -1.0;
+                double negativeTopBottomMargin = topBottomPadding * -1.0;
 
-            button.Margin({negativeCardMargin, negativeTopBottomMargin, negativeCardMargin, negativeTopBottomMargin});
+                button.Margin({negativeCardMargin, negativeTopBottomMargin, negativeCardMargin, negativeTopBottomMargin});
+            }
         }
 
         // Style the hit target button

diff --git a/source/uwp/SharedRenderer/lib/AdaptiveCardRendererComponent.cpp b/source/uwp/SharedRenderer/lib/AdaptiveCardRendererComponent.cpp
@@ -78,6 +78,16 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation
         GetHostConfig()->OverflowMaxActions = overflowMaxActions;
     }
 
+    bool AdaptiveCardRenderer::AddSelectActionMargin()
+    {
+        return GetHostConfig()->AddSelectActionMargin;
+    }
+
+    void AdaptiveCardRenderer::AddSelectActionMargin(bool addSelectActionMargin)
+    {
+        GetHostConfig()->AddSelectActionMargin = addSelectActionMargin;
+    }
+
     winrt::RenderedAdaptiveCard AdaptiveCardRenderer::RenderAdaptiveCard(winrt::AdaptiveCard const& adaptiveCard)
     {
         auto renderedCard = winrt::make_self<implementation::RenderedAdaptiveCard>();

diff --git a/source/uwp/SharedRenderer/lib/AdaptiveCardRendererComponent.h b/source/uwp/SharedRenderer/lib/AdaptiveCardRendererComponent.h
@@ -70,6 +70,9 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation
             return GetHostConfig()->OverflowButtonAccessibilityText = text;
         }
 
+        void AddSelectActionMargin(bool addSelectActionMargin);
+        bool AddSelectActionMargin();
+
         winrt::RenderedAdaptiveCard RenderAdaptiveCard(winrt::AdaptiveCard const& adaptiveCard);
         winrt::RenderedAdaptiveCard RenderAdaptiveCardFromJsonString(hstring const& adaptiveJson);
         winrt::RenderedAdaptiveCard RenderAdaptiveCardFromJson(winrt::JsonObject const& adaptiveJson);

diff --git a/source/uwp/SharedRenderer/lib/AdaptiveHostConfig.cpp b/source/uwp/SharedRenderer/lib/AdaptiveHostConfig.cpp
@@ -66,7 +66,7 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation
         TextBlock{winrt::make<implementation::AdaptiveTextBlockConfig>(sharedHostConfig.GetTextBlock())},
         TextStyles{winrt::make<implementation::AdaptiveTextStylesConfig>(sharedHostConfig.GetTextStyles())},
         Table{winrt::make<implementation::AdaptiveTableConfig>(sharedHostConfig.GetTable())}, OverflowMaxActions{false},
-        OverflowButtonText{L"..."}, OverflowButtonAccessibilityText{L"More Actions"}
+        OverflowButtonText{L"..."}, OverflowButtonAccessibilityText{L"More Actions"}, AddSelectActionMargin{true}
     {
     }
 }
diff --git a/source/uwp/SharedRenderer/lib/AdaptiveHostConfig.h b/source/uwp/SharedRenderer/lib/AdaptiveHostConfig.h
@@ -35,6 +35,7 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation
         property<bool> OverflowMaxActions;
         property<hstring> OverflowButtonText;
         property<hstring> OverflowButtonAccessibilityText;
+        property<bool> AddSelectActionMargin;
 
         // ITypePeek method
         void* PeekAt(REFIID riid) override { return PeekHelper(riid, this); }

diff --git a/source/uwp/SharedVisualizer/ViewModel/DocumentViewModel.cs b/source/uwp/SharedVisualizer/ViewModel/DocumentViewModel.cs
@@ -255,6 +255,9 @@ public static void InitializeRenderer(AdaptiveHostConfig hostConfig)
 
             _renderer.OverflowMaxActions = true;
 
+            // Uncomment the line below to remove margins from selectAction. Default is `true`
+            //_renderer.AddSelectActionMargin = false;
+
             // Add a feature representing this version of the visualizer. used for test cards.
             _renderer.FeatureRegistration.Set("acTest", "1.0");
 

diff --git a/source/uwp/winui3/Renderer/AdaptiveCardRenderer.vcxproj b/source/uwp/winui3/Renderer/AdaptiveCardRenderer.vcxproj
@@ -124,6 +124,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

diff --git a/source/uwp/winui3/Renderer/idl/AdaptiveCards.Rendering.WinUI3.idl b/source/uwp/winui3/Renderer/idl/AdaptiveCards.Rendering.WinUI3.idl
@@ -48,6 +48,8 @@ namespace AdaptiveCards
                 String OverflowButtonText;
                 String OverflowButtonAccessibilityText;
 
+                Boolean AddSelectActionMargin;
+
                 void SetFixedDimensions(UInt32 desiredWidth, UInt32 desiredHeight);
                 void ResetFixedDimensions();