Fix TypesLayout children CheckedChanged delegate

hyvart · Apr 30, 2021 · 941f6d2 · 941f6d2
1 parent 1131fb1
commit 941f6d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Forms/Views/ScoreSelector.xaml b/Forms/Views/ScoreSelector.xaml
@@ -27,12 +27,12 @@
               <VisualStateGroup x:Name="CheckedStates">
                 <VisualState x:Name="Checked">
                   <VisualState.Setters>
-                    <Setter Property="BackgroundColor" Value="{StaticResource DarkButtonBackgroundColor}" />
+                    <Setter Property="Style" Value="{StaticResource CheckedStyle}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Unchecked">
                   <VisualState.Setters>
-                    <Setter Property="BackgroundColor" Value="{StaticResource LightButtonBackgroundColor}" />
+                    <Setter Property="Style" Value="{StaticResource UncheckedStyle}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
@@ -41,6 +41,15 @@
         </Frame>
       </ControlTemplate>
 
+      <Style x:Key="CheckedStyle" TargetType="RadioButton">
+        <Setter Property="BackgroundColor" Value="DimGray" />
+        <Setter Property="BorderColor" Value="Cyan" />
+      </Style>
+
+      <Style x:Key="UncheckedStyle" TargetType="RadioButton">
+        <Setter Property="BorderColor" Value="DarkGray" />
+      </Style>
+
     </ResourceDictionary>
   </ContentView.Resources>
 

diff --git a/Forms/Views/ScoreSelector.xaml.cs b/Forms/Views/ScoreSelector.xaml.cs
@@ -79,7 +79,7 @@ public IList<ScoreInfo> Scores
               ControlTemplate = Device.macOS != Device.RuntimePlatform ? ScoreSelectorTemplate : null,
               TextColor = Color.White
             };
-            rb.CheckedChanged += Instrument_CheckedChanged;
+            rb.CheckedChanged += Types_CheckedChanged;
             if (TypesLayout.Children.Count == 0)
               rb.IsChecked = true;//TODO: Override via settings