Skip to content

#3185 - Oddness with Theming and Selection in InfiniteCanvas Control #3194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 31, 2020
Merged

#3185 - Oddness with Theming and Selection in InfiniteCanvas Control #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8303a5d
#3185 - Oddness with Theming and Selection in InfiniteCanvas Control
deanchalkbp Mar 25, 2020
9f316f1
Merge branch 'master' of https://github.com/windows-toolkit/WindowsCo…
deanchalkbp Mar 26, 2020
9e57757
Incorrect Bindings to Color resources rather than Brush reasources
deanchalkbp Mar 27, 2020
b1d8a07
Merge branch 'master' of https://github.com/windows-toolkit/WindowsCo…
deanchalkbp Mar 27, 2020
21d3d21
Merge branch 'master' into master
michael-hawker Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
10 changes: 5 additions & 5 deletions Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -57,7 +57,7 @@
</Button>
</StackPanel>
<StackPanel x:Name="CanvasTextBoxTools"
Background="{ThemeResource SystemChromeMediumColor}"
Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
Orientation="Horizontal"
Visibility="Collapsed">
<Grid Width="2"
Expand Down Expand Up @@ -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>

Expand Down