Merge pull request #3194 from deanchalk/master

#3185 - Oddness with Theming and Selection in InfiniteCanvas Control
CommunityToolkit · Mar 31, 2020 · 45cdd25 · 45cdd25
2 parents adf771e + 21d3d21
commit 45cdd25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs
@@ -35,22 +35,6 @@ protected override void OnApplyTemplate()
             _editZone.TextChanged -= EditZone_TextChanged;
             _editZone.TextChanged += EditZone_TextChanged;
             _editZone.FontSize = FontSize;
-            _editZone.SelectionHighlightColorWhenNotFocused.Color = Color.FromArgb(
-                    1,
-                    _editZone.SelectionHighlightColor.Color.R,
-                    _editZone.SelectionHighlightColor.Color.G,
-                    _editZone.SelectionHighlightColor.Color.B);
-            _editZone.SelectionHighlightColorWhenNotFocused.Opacity = .1;
-
-            _editZone.SelectionHighlightColor.Color =
-                Color.FromArgb(
-                    1,
-                    _editZone.SelectionHighlightColor.Color.R,
-                    _editZone.SelectionHighlightColor.Color.G,
-                    _editZone.SelectionHighlightColor.Color.B);
-
-            _editZone.SelectionHighlightColor.Opacity = .1;
-
             base.OnApplyTemplate();
         }
 

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
@@ -29,11 +29,11 @@
                                     </InkToolbarCustomToolButton>
                                 </InkToolbar>
 
-                                <StackPanel Background="{ThemeResource SystemChromeMediumColor}"
+                                <StackPanel Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
                                             Orientation="Horizontal">
                                     <Grid Width="2"
                                           Height="48"
-                                          Background="{ThemeResource SystemListMediumColor}" />
+                                          Background="{ThemeResource SystemControlBackgroundListMediumBrush}" />
                                     <Button x:Name="EraseAllButton"
                                             Style="{StaticResource CanvasTextBoxButtonStyle}"
                                             ToolTipService.ToolTip="Erase All">
@@ -57,7 +57,7 @@
                                     </Button>
                                 </StackPanel>
                                 <StackPanel x:Name="CanvasTextBoxTools"
-                                            Background="{ThemeResource SystemChromeMediumColor}"
+                                            Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
                                             Orientation="Horizontal"
                                             Visibility="Collapsed">
                                     <Grid Width="2"
@@ -157,14 +157,14 @@
            TargetType="ToggleButton">
         <Setter Property="Width" Value="48" />
         <Setter Property="Height" Value="48" />
-        <Setter Property="Background" Value="{ThemeResource SystemChromeMediumColor}" />
+        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
     </Style>
     <Style x:Key="CanvasTextBoxButtonStyle"
            TargetType="Button">
         <Setter Property="Width" Value="48" />
         <Setter Property="Height" Value="48" />
-        <Setter Property="Background" Value="{ThemeResource SystemChromeMediumColor}" />
+        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
     </Style>