Skip to content

Added theme-specific background for XAML code errors #3588

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
6 commits merged into from
Dec 5, 2020
Merged

Added theme-specific background for XAML code errors #3588

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
869dd4f
Added a theme listener, separate light/dark theme error styles, and p…
winston-de Nov 30, 2020
31db770
Consolidated code
winston-de Nov 30, 2020
1a1d597
Merge branch 'master' into master
winston-de Dec 3, 2020
379e431
Merge branch 'master' into master
winston-de Dec 4, 2020
033cd45
Updated dark theme color to #660000
winston-de Dec 4, 2020
c6648c6
Merge branch 'master' of https://github.com/winston-de/WindowsCommuni…
winston-de Dec 4, 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
12 changes: 8 additions & 4 deletions Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public sealed partial class XamlCodeEditor : UserControl
public static readonly DependencyProperty TextProperty =
DependencyProperty.Register(nameof(Text), typeof(string), typeof(XamlCodeEditor), new PropertyMetadata(string.Empty));

private ThemeListener _themeListener = new ThemeListener();

public XamlCodeEditor()
{
this.InitializeComponent();
Expand All @@ -40,7 +42,7 @@ public async void ReportError(XamlExceptionRange error)
// Highlight Error Line
XamlCodeRenderer.Decorations.Add(new IModelDeltaDecoration(
range,
new IModelDecorationOptions() { IsWholeLine = true, ClassName = _errorStyle, HoverMessage = new string[] { error.Message }.ToMarkdownString() }));
new IModelDecorationOptions() { IsWholeLine = true, ClassName = ErrorStyle, HoverMessage = new string[] { error.Message }.ToMarkdownString() }));

// Show Glyph Icon
XamlCodeRenderer.Decorations.Add(new IModelDeltaDecoration(
Expand Down Expand Up @@ -121,10 +123,12 @@ public string Text

public DateTime TimeSampleEditedLast { get; private set; } = DateTime.MinValue;

private CssLineStyle _errorStyle = new CssLineStyle()
private CssLineStyle ErrorStyle
{
BackgroundColor = new SolidColorBrush(Color.FromArgb(0x00, 0xFF, 0xD6, 0xD6))
};
get => _themeListener.CurrentTheme.Equals(ApplicationTheme.Light) ?
new CssLineStyle() { BackgroundColor = new SolidColorBrush(Color.FromArgb(0x00, 0xFF, 0xD6, 0xD6)) } :
new CssLineStyle() { BackgroundColor = new SolidColorBrush(Color.FromArgb(0x00, 0x66, 0x00, 0x00)) };
}

private CssGlyphStyle _errorIconStyle = new CssGlyphStyle()
{
Expand Down