[UWP Renderer] Add title to action when icon is present (#8231)

anna-dingler · jwoo-msft · web-flow · commit 16dd54005208 · 2023-02-22T14:53:38.000-08:00
* Switch to gotFocus (#8148) (#8150) * Update custom.props * [UWP] Update custom.props for object model release (#8225) * Update custom.props for object model release * Updated Xcode version (#8222) * removed build step as they are redundant (#8201) * removed build step as they are redundant * added pod installation step Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com> * [UWP Renderer] Add a null check to inline action rendering (#8228) * Update custom.props for object model release * Updated Xcode version (#8222) * removed build step as they are redundant (#8201) * removed build step as they are redundant * added pod installation step * Add a null check for inline Actions Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com> * Add title to button --------- Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
diff --git a/source/uwp/SharedRenderer/lib/ActionHelpers.cpp b/source/uwp/SharedRenderer/lib/ActionHelpers.cpp
@@ -158,6 +158,9 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers
                 XamlHelpers::AppendXamlElementToPanel(separator, buttonContentsStackPanel);
             }
 
+            // Add Text to stack panel
+            XamlHelpers::AppendXamlElementToPanel(buttonText, buttonContentsStackPanel);
+
             // Finally, put the stack panel inside the final button
             button.Content(buttonContentsStackPanel);
         }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,9 @@ namespace AdaptiveCards::Rendering::Xaml_Rendering::ActionHelpers`
`158`	`158`	`XamlHelpers::AppendXamlElementToPanel(separator, buttonContentsStackPanel);`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ // Add Text to stack panel`
	`162`	`+ XamlHelpers::AppendXamlElementToPanel(buttonText, buttonContentsStackPanel);`
	`163`	`+`
`161`	`164`	`// Finally, put the stack panel inside the final button`
`162`	`165`	`button.Content(buttonContentsStackPanel);`
`163`	`166`	`}`