clean up

microsoft · Feb 2, 2024 · f659bb2 · f659bb2
1 parent 181b806
commit f659bb2
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 57 deletions.
diff --git a/source/uwp/SharedRenderer/lib/AdaptiveCarouselRenderer.cpp b/source/uwp/SharedRenderer/lib/AdaptiveCarouselRenderer.cpp
@@ -171,7 +171,6 @@ namespace winrt::AdaptiveCards::Rendering::Xaml_Rendering::implementation
                 carouselBorder.Child(gridContainer);
             }
 
-
             // If we changed the context's rtl setting, set it back after rendering the children
             if (updatedRtl)
             {

diff --git a/source/uwp/SharedRenderer/lib/XamlBuilder.cpp b/source/uwp/SharedRenderer/lib/XamlBuilder.cpp
@@ -266,62 +266,62 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering
         winrt::AdaptiveFeatureRegistration const& featureRegistration,
         boolean ancestorHasFallback)
     {
-		winrt::FallbackType elementFallback = element.FallbackType();
-		bool elementHasFallback = elementFallback != winrt::FallbackType::None || ancestorHasFallback;
-		renderArgs.AncestorHasFallback(elementHasFallback);
-		// Check to see if element's requirements are being met
-		bool shouldFallback = featureRegistration && !MeetsRequirements(element, featureRegistration);
-		if (!elementRenderer || shouldFallback)
-		{
-			throw winrt::hresult_error(E_PERFORM_FALLBACK);
-		}
+        winrt::FallbackType elementFallback = element.FallbackType();
+        bool elementHasFallback = elementFallback != winrt::FallbackType::None || ancestorHasFallback;
+        renderArgs.AncestorHasFallback(elementHasFallback);
+        // Check to see if element's requirements are being met
+        bool shouldFallback = featureRegistration && !MeetsRequirements(element, featureRegistration);
+        if (!elementRenderer || shouldFallback)
+        {
+            throw winrt::hresult_error(E_PERFORM_FALLBACK);
+        }
     }
 
     RenderedElementStruct XamlBuilder::RenderAsUIElement(
         winrt::IAdaptiveCardElement const& element,
         winrt::AdaptiveRenderContext const&renderContext,
-		winrt::AdaptiveRenderArgs const&renderArgs,
+        winrt::AdaptiveRenderArgs const&renderArgs,
         winrt::AdaptiveFeatureRegistration const& featureRegistration,
         bool ancestorHasFallback)
     {
-		winrt::UIElement newControl{nullptr};
-		winrt::IAdaptiveCardElement renderedElement{nullptr};
+        winrt::UIElement newControl{nullptr};
+        winrt::IAdaptiveCardElement renderedElement{nullptr};
 
-		try
-		{
+        try
+        {
             auto elementRenderer = renderContext.ElementRenderers().Get(element.ElementTypeString());
 
-			ShouldFallback(
-				element,
-				elementRenderer,
-				renderArgs,
-				featureRegistration,
+            ShouldFallback(
+                element,
+                elementRenderer,
+                renderArgs,
+                featureRegistration,
                 ancestorHasFallback);
 
             return {elementRenderer.Render(element, renderContext, renderArgs), element};
 
-		}
-		catch (winrt::hresult_error const& ex)
-		{
-			// We're only interested in fallback exception
-			if (ex.code() != E_PERFORM_FALLBACK)
-			{
-				throw ex;
-			}
-
-			try
-			{
-				std::tie(newControl, renderedElement) = XamlHelpers::RenderFallback(element, renderContext, renderArgs);
-			}
-			catch (winrt::hresult_error const& ex)
-			{
-				// if we get an E_PERFORM_FALLBACK error again, we should only throw it if `ancestorHasFallBack`
-				if (ex.code() != E_PERFORM_FALLBACK || (ex.code() == E_PERFORM_FALLBACK && ancestorHasFallback))
-				{
-					throw ex;
-				}
-			}
-		}
+        }
+        catch (winrt::hresult_error const& ex)
+        {
+            // We're only interested in fallback exception
+            if (ex.code() != E_PERFORM_FALLBACK)
+            {
+                throw ex;
+            }
+
+            try
+            {
+                std::tie(newControl, renderedElement) = XamlHelpers::RenderFallback(element, renderContext, renderArgs);
+            }
+            catch (winrt::hresult_error const& ex)
+            {
+                // if we get an E_PERFORM_FALLBACK error again, we should only throw it if `ancestorHasFallBack`
+                if (ex.code() != E_PERFORM_FALLBACK || (ex.code() == E_PERFORM_FALLBACK && ancestorHasFallback))
+                {
+                    throw ex;
+                }
+            }
+        }
 
         return {};
     }
@@ -343,7 +343,7 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering
             // If we got a control, add a separator if needed and the control to the parent panel
             if (newControl)
             {
-				auto hostConfig = renderContext.HostConfig();
+                auto hostConfig = renderContext.HostConfig();
                 auto separator = XamlHelpers::AddSeparatorIfNeeded(iElement, element, hostConfig, renderContext, parentPanel);
 
                 // If the renderedElement was an input, render the label and error message

diff --git a/source/uwp/SharedRenderer/lib/XamlBuilder.h b/source/uwp/SharedRenderer/lib/XamlBuilder.h
@@ -8,11 +8,11 @@
 
 namespace AdaptiveCards::Rendering::Xaml_Rendering
 {
-	struct RenderedElementStruct
-	{
-		winrt::UIElement renderedUI {nullptr};
-		winrt::IAdaptiveCardElement adaptiveElement {nullptr};
-	};
+    struct RenderedElementStruct
+    {
+        winrt::UIElement renderedUI {nullptr};
+        winrt::IAdaptiveCardElement adaptiveElement {nullptr};
+    };
 
     struct XamlBuilder : winrt::implements<XamlBuilder, winrt::IInspectable, IImageLoadTrackerListener>
     {
@@ -55,7 +55,7 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering
                                     winrt::AdaptiveRenderContext const& renderContext,
                                     winrt::AdaptiveRenderArgs const& renderArgs);
 
-		static RenderedElementStruct RenderAsUIElement(
+        static RenderedElementStruct RenderAsUIElement(
             winrt::IAdaptiveCardElement const& element,
             winrt::AdaptiveRenderContext const& renderContext,
             winrt::AdaptiveRenderArgs const& renderArgs,
@@ -132,7 +132,7 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering
         void SetRasterizedPixelHeight(winrt::ImageSource const& imageSource, double const& imageSize);
         void SetRasterizedPixelWidth(winrt::ImageSource const& imageSource, double const& imageSize);
 
-		static void ShouldFallback(winrt::IAdaptiveCardElement const& element,
+        static void ShouldFallback(winrt::IAdaptiveCardElement const& element,
                                    winrt::IAdaptiveElementRenderer const& elementRenderer,
                                    winrt::AdaptiveRenderArgs const& renderArgs,
                                    winrt::AdaptiveFeatureRegistration const& featureRegistration,

diff --git a/source/uwp/winui3/Renderer/idl/AdaptiveCards.Rendering.WinUI3.idl b/source/uwp/winui3/Renderer/idl/AdaptiveCards.Rendering.WinUI3.idl
@@ -675,13 +675,6 @@ namespace AdaptiveCards
                 Boolean ExpectedVisibility;
                 Boolean IsStretchable;
             }
-
-            //runtimeclass CarouselView : Microsoft.UI.Xaml.Controls.FlipView
-            //{
-            //    CarouselView();
-            //    void AddPanel(Microsoft.UI.Xaml.UIElement uielement);
-            //}
-
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                     carouselBorder.Child(gridContainer);
                 }
                 // If we changed the context's rtl setting, set it back after rendering the children
                 if (updatedRtl)
                 {
@@ Expand Down @@