From 1e302cac58d5b9cea8464acec8a8e18f5a5204ce Mon Sep 17 00:00:00 2001
From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com>
Date: Thu, 7 May 2020 16:41:08 -0700
Subject: [PATCH] Associate Units and Theme labels with the radio button groups
 (#1211)

* Wrap theme radio buttons in MUXC RadioButtons control to fix accessibility issue where the buttons are grouped with the theme title

* Associated theme labels with radio button groups
---
 .../Views/GraphingCalculator/GraphingSettings.xaml           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
index f40eb260..bcbce26a 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
@@ -174,7 +174,7 @@
                        Style="{StaticResource SubTitleTextBoxStyle}"
                        AutomationProperties.HeadingLevel="Level2"/>
 
-            <StackPanel Orientation="Horizontal">
+            <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}" Orientation="Horizontal">
                 <RadioButton x:Name="Radians"
                              x:Uid="TrigModeRadians"
                              Style="{StaticResource TrigUnitsRadioButtonStyle}"
@@ -218,14 +218,13 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-
             <TextBlock x:Name="GraphThemeHeading"
                        x:Uid="GraphThemeHeading"
                        Margin="0,16,0,6"
                        Style="{StaticResource SubTitleTextBoxStyle}"
                        AutomationProperties.HeadingLevel="Level2"/>
 
-            <StackPanel Orientation="Vertical">
+            <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=GraphThemeHeading}">
                 <RadioButton x:Uid="AlwaysLightTheme" IsChecked="{x:Bind IsMatchAppTheme, Mode=TwoWay, Converter={StaticResource BooleanNegationConverter}}"/>
                 <RadioButton x:Uid="MatchAppTheme"
                              Margin="1,0"