A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added Paste/Load/Copy/Clear buttons to Formatted Text Block and Text Editor
Etienne Baudouxfa956d6a9bd4
diff --git a/src/dev/impl/DevTools.Common/DevTools.Common.csproj b/src/dev/impl/DevTools.Common/DevTools.Common.csprojindex dc6df636e..ee8296529 100644--- a/src/dev/impl/DevTools.Common/DevTools.Common.csproj+++ b/src/dev/impl/DevTools.Common/DevTools.Common.csproj@@ -98,6 +98,9 @@<Compile Include="UI\Controls\TextEditor\KeyboardCommandHandler.cs" /><Compile Include="UI\Controls\TextEditor\RtfBuilder.cs" /><Compile Include="UI\Controls\TextEditor\RtfFormat.cs" />+ <Compile Include="UI\Controls\TextEditor\TextEditor.xaml.cs">+ <DependentUpon>TextEditor.xaml</DependentUpon>+ </Compile><Compile Include="UI\Controls\TextEditor\TextFormatter.cs" /><Compile Include="UI\Converters\BooleanToTextWrappingConverter.cs" /><Compile Include="UI\Converters\BooleanToScrollBarVisibilityConverter.cs" />@@ -110,7 +113,7 @@<Compile Include="UI\Controls\ExpandableSettingHeaderControl.xaml.cs"><DependentUpon>ExpandableSettingHeaderControl.xaml</DependentUpon></Compile>- <Compile Include="UI\Controls\TextEditor\TextEditor.cs" />+ <Compile Include="UI\Controls\TextEditor\TextEditorCore.cs" /><Compile Include="UI\Converters\EnumToBooleanConverter.cs" /><Compile Include="UI\Converters\EnumToThicknessConverter.cs" /><Compile Include="UI\Converters\BooleanToVisibilityConverter.cs" />@@ -166,6 +169,10 @@<SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>+ <Page Include="UI\Controls\TextEditor\TextEditor.xaml">+ <SubType>Designer</SubType>+ <Generator>MSBuild:Compile</Generator>+ </Page></ItemGroup><ItemGroup><PRIResource Include="Strings\en\Base64EncoderDecoder.resw" />diff --git a/src/dev/impl/DevTools.Common/Themes/Custom.xaml b/src/dev/impl/DevTools.Common/Themes/Custom.xamlindex 1285566bf..f29f401bf 100644--- a/src/dev/impl/DevTools.Common/Themes/Custom.xaml+++ b/src/dev/impl/DevTools.Common/Themes/Custom.xaml@@ -1,6 +1,6 @@<ResourceDictionary- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localization="using:DevTools.Common">+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"><FontFamily x:Key="FluentSystemIcons">ms-appx:///DevTools.Common/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily><FontFamily x:Key="CascadiaMono">ms-appx:///DevTools.Common/Assets/CascadiaMono.ttf#Cascadia Mono</FontFamily>diff --git a/src/dev/impl/DevTools.Common/Themes/Generic.xaml b/src/dev/impl/DevTools.Common/Themes/Generic.xamlindex 692f86ced..1a2d91b9a 100644--- a/src/dev/impl/DevTools.Common/Themes/Generic.xaml+++ b/src/dev/impl/DevTools.Common/Themes/Generic.xaml@@ -67,7 +67,7 @@</Setter></Style>- <Style TargetType="textEditor:TextEditor">+ <Style TargetType="textEditor:TextEditorCore"><Setter Property="Foreground" Value="{ThemeResource TextEditorForeground}"/><Setter Property="Background" Value="{ThemeResource TextControlBackground}"/><Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}"/>@@ -88,7 +88,6 @@<ControlTemplate TargetType="RichEditBox"><Grid><Grid.RowDefinitions>- <RowDefinition Height="Auto"/><RowDefinition Height="*"/><RowDefinition Height="Auto"/></Grid.RowDefinitions>@@ -148,20 +147,6 @@</VisualState></VisualStateGroup></VisualStateManager.VisualStateGroups>- <ContentPresenter- x:Name="HeaderContentPresenter"- ContentTemplate="{TemplateBinding HeaderTemplate}"- Content="{TemplateBinding Header}"- FontFamily="{ThemeResource ContentControlThemeFontFamily}"- FontWeight="Normal"- Foreground="{ThemeResource TextControlHeaderForeground}"- Margin="{ThemeResource RichEditBoxTopHeaderMargin}"- Grid.Row="0"- TextWrapping="Wrap"- VerticalAlignment="Top"- Visibility="Collapsed"- x:DeferLoadStrategy="Lazy">- </ContentPresenter><Borderx:Name="BorderElement"Background="{TemplateBinding Background}"@@ -170,8 +155,8 @@CornerRadius="4"MinHeight="{ThemeResource TextControlThemeMinHeight}"MinWidth="{ThemeResource TextControlThemeMinWidth}"- Grid.Row="1"/>- <Grid x:Name="RootGrid" Grid.Row="1">+ Grid.Row="0"/>+ <Grid x:Name="RootGrid" Grid.Row="0"><Grid.ColumnDefinitions><ColumnDefinition x:Name="LineNumberColumnDefinition" Width="Auto"/><ColumnDefinition x:Name="TextEditorColumnDefinition" Width="*"/>@@ -204,6 +189,7 @@IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"IsTabStop="False"+ TabIndex="1"IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"Margin="{TemplateBinding BorderThickness}"Padding="{TemplateBinding Padding}"@@ -218,7 +204,7 @@IsHitTestVisible="False"Margin="{TemplateBinding BorderThickness}"Padding="{TemplateBinding Padding}"- Grid.Row="1"+ Grid.Row="0"Text="{TemplateBinding PlaceholderText}"TextWrapping="{TemplateBinding TextWrapping}"TextAlignment="{TemplateBinding TextAlignment}"@@ -228,7 +214,7 @@AutomationProperties.AccessibilityView="Raw"Content="{TemplateBinding Description}"Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}"- Grid.Row="2"+ Grid.Row="1"x:Load="False"/></Grid></ControlTemplate>diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml b/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xamlindex ff30a1cc2..dfc9da6f9 100644--- a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml+++ b/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml@@ -23,6 +23,7 @@<Grid.ColumnDefinitions><ColumnDefinition Width="*"/><ColumnDefinition Width="Auto"/>+ <ColumnDefinition Width="Auto"/></Grid.ColumnDefinitions><ContentPresenterx:Name="HeaderContentPresenter"@@ -36,11 +37,60 @@TextWrapping="Wrap"VerticalAlignment="Bottom"Visibility="Collapsed"/>+ <StackPanel+ Grid.Row="0"+ Grid.Column="1"+ Orientation="Horizontal"+ HorizontalAlignment="Right"+ Spacing="8"+ Margin="0,0,0,8">+ <Button+ x:Name="PasteButton"+ x:DeferLoadStrategy="Lazy"+ Visibility="Collapsed"+ TabIndex="0"+ Click="PasteButton_Click">+ <StackPanel Orientation="Horizontal" Spacing="4">+ <FontIcon Glyph=""/>+ <TextBlock VerticalAlignment="Center" Text="{Binding Instance.Common.Paste, Mode=OneTime, Source={StaticResource LanguageManager}}"/>+ </StackPanel>+ </Button>+ <Button+ x:Name="OpenFileButton"+ x:DeferLoadStrategy="Lazy"+ Visibility="Collapsed"+ TabIndex="0"+ ToolTipService.ToolTip="{Binding Instance.Common.OpenFile, Mode=OneTime, Source={StaticResource LanguageManager}}"+ Click="OpenFileButton_Click">+ <FontIcon Glyph=""/>+ </Button>+ <Button+ x:Name="ClearButton"+ x:DeferLoadStrategy="Lazy"+ Visibility="Collapsed"+ TabIndex="0"+ ToolTipService.ToolTip="{Binding Instance.Common.Clear, Mode=OneTime, Source={StaticResource LanguageManager}}"+ Click="ClearButton_Click">+ <FontIcon Glyph=""/>+ </Button>+ <Button+ x:Name="CopyButton"+ x:DeferLoadStrategy="Lazy"+ TabIndex="2"+ Visibility="Collapsed"+ Click="CopyButton_Click">+ <StackPanel Orientation="Horizontal" Spacing="4">+ <FontIcon Glyph=""/>+ <TextBlock VerticalAlignment="Center" Text="{Binding Instance.Common.Copy, Mode=OneTime, Source={StaticResource LanguageManager}}"/>+ </StackPanel>+ </Button>+ </StackPanel><TextBoxx:Name="TextBox"x:DeferLoadStrategy="Lazy"Grid.Row="1"Grid.Column="0"+ Grid.ColumnSpan="2"TabIndex="1"IsSpellCheckEnabled="False"TextWrapping="{x:Bind AcceptsReturn, Mode=OneWay, Converter={StaticResource BooleanToTextWrappingConverter}}"@@ -53,6 +103,7 @@x:DeferLoadStrategy="Lazy"Grid.Row="1"Grid.Column="0"+ Grid.ColumnSpan="2"TabIndex="1"IsSpellCheckEnabled="False"TextWrapping="{x:Bind AcceptsReturn, Mode=OneWay, Converter={StaticResource BooleanToTextWrappingConverter}}"@@ -133,59 +184,11 @@</MenuFlyout></RichEditBox.ContextFlyout></RichEditBox>- <StackPanel- Grid.Row="0"- Grid.Column="0"- Orientation="Horizontal"- HorizontalAlignment="Right"- Spacing="8"- Margin="0,0,0,8">- <Button- x:Name="PasteButton"- x:DeferLoadStrategy="Lazy"- Visibility="Collapsed"- TabIndex="0"- Click="PasteButton_Click">- <StackPanel Orientation="Horizontal" Spacing="4">- <FontIcon Glyph=""/>- <TextBlock VerticalAlignment="Center" Text="{Binding Instance.Common.Paste, Mode=OneTime, Source={StaticResource LanguageManager}}"/>- </StackPanel>- </Button>- <Button- x:Name="OpenFileButton"- x:DeferLoadStrategy="Lazy"- Visibility="Collapsed"- TabIndex="0"- ToolTipService.ToolTip="{Binding Instance.Common.OpenFile, Mode=OneTime, Source={StaticResource LanguageManager}}"- Click="OpenFileButton_Click">- <FontIcon Glyph=""/>- </Button>- <Button- x:Name="ClearButton"- x:DeferLoadStrategy="Lazy"- Visibility="Collapsed"- TabIndex="0"- ToolTipService.ToolTip="{Binding Instance.Common.Clear, Mode=OneTime, Source={StaticResource LanguageManager}}"- Click="ClearButton_Click">- <FontIcon Glyph=""/>- </Button>- <Button- x:Name="CopyButton"- x:DeferLoadStrategy="Lazy"- TabIndex="2"- Visibility="Collapsed"- Click="CopyButton_Click">- <StackPanel Orientation="Horizontal" Spacing="4">- <FontIcon Glyph=""/>- <TextBlock VerticalAlignment="Center" Text="{Binding Instance.Common.Copy, Mode=OneTime, Source={StaticResource LanguageManager}}"/>- </StackPanel>- </Button>- </StackPanel><Buttonx:Name="InlinedCopyButton"x:DeferLoadStrategy="Lazy"Grid.Row="1"- Grid.Column="1"+ Grid.Column="2"TabIndex="2"Margin="8,0,0,0"Visibility="Collapsed"diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml b/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xamlindex f6146861a..d996647a6 100644--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml+++ b/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml@@ -14,6 +14,12 @@<RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>++ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+<VisualStateManager.VisualStateGroups><VisualStateGroup x:Name="CommonStates"><VisualState x:Name="Disabled">@@ -58,10 +64,12 @@</VisualState></VisualStateGroup></VisualStateManager.VisualStateGroups>+<ContentPresenterx:Name="HeaderContentPresenter"x:DeferLoadStrategy="Lazy"Grid.Row="0"+ Grid.Column="0"Content="{x:Bind Header}"Foreground="{ThemeResource TextControlHeaderForeground}"Margin="{ThemeResource TextBoxTopHeaderMargin}"@@ -69,9 +77,28 @@TextWrapping="Wrap"VerticalAlignment="Bottom"Visibility="Collapsed"/>+ <StackPanel+ Grid.Row="0"+ Grid.Column="1"+ Orientation="Horizontal"+ HorizontalAlignment="Right"+ Spacing="8"+ Margin="0,0,0,8">+ <Button+ x:Name="CopyButton"+ TabIndex="2"+ Click="CopyButton_Click">+ <StackPanel Orientation="Horizontal" Spacing="4">+ <FontIcon Glyph=""/>+ <TextBlock VerticalAlignment="Center" Text="{Binding Instance.Common.Copy, Mode=OneTime, Source={StaticResource LanguageManager}}"/>+ </StackPanel>+ </Button>+ </StackPanel>+<Borderx:Name="BorderElement"Grid.Row="1"+ Grid.ColumnSpan="2"Background="{ThemeResource TextControlBackground}"BorderThickness="{ThemeResource TextControlBorderThemeThickness}"BorderBrush="{ThemeResource TextControlBorderBrush}"@@ -81,6 +108,7 @@<ScrollViewerx:Name="ContentElement"Grid.Row="1"+ Grid.ColumnSpan="2"AutomationProperties.AccessibilityView="Raw"HorizontalScrollBarVisibility="Auto"HorizontalScrollMode="Enabled"diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs b/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.csindex 886697f36..f90bec16b 100644--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs+++ b/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml.cs@@ -11,6 +11,7 @@ using Microsoft.Toolkit.Uwp.Helpers;using System;using System.Collections.Generic;using System.Text;+using Windows.ApplicationModel.DataTransfer;using Windows.Foundation;using Windows.UI;using Windows.UI.Xaml;@@ -504,6 +505,17 @@ namespace DevTools.Common.UI.Controls.FormattedTextBlockResetRootGridClipping();}+ private void CopyButton_Click(object sender, RoutedEventArgs e)+ {+ var data = new DataPackage+ {+ RequestedOperation = DataPackageOperation.Copy+ };+ data.SetText(_document);++ Clipboard.SetContent(data);+ }+private static void OnSettingsProviderPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e){ISettingsProvider? settingProvider = e.NewValue as ISettingsProvider;diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xamlnew file mode 100644index 000000000..d248794b1--- /dev/null+++ b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml@@ -0,0 +1,75 @@+<UserControl+ x:Class="DevTools.Common.UI.Controls.TextEditor.TextEditor"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:common="using:DevTools.Common"+ xmlns:local="using:DevTools.Common.UI.Controls.TextEditor"+ mc:Ignorable="d"+ d:DesignHeight="300"+ d:DesignWidth="400">+ <UserControl.Resources>+ <common:LanguageManager x:Key="LanguageManager"/>+ </UserControl.Resources>++ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto"/>+ <RowDefinition Height="*"/>+ </Grid.RowDefinitions>++ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>++ <ContentPresenter+ x:Name="HeaderContentPresenter"+ Grid.Row="0"+ Grid.Column="0"+ Content="{x:Bind Header}"+ FontFamily="{ThemeResource ContentControlThemeFontFamily}"+ FontWeight="Normal"+ Foreground="{ThemeResource TextControlHeaderForeground}"+ Margin="{ThemeResource RichEditBoxTopHeaderMargin}"+ TextWrapping="Wrap"+ VerticalAlignment="Bottom">+ </ContentPresenter>+ <StackPanel+ Grid.Row="0"+ Grid.Column="1"+ Orientation="Horizontal"+ HorizontalAlignment="Right"+ Spacing="8"+ Margin="0,0,0,8">+ <Button+ x:Name="PasteButton"+ Click="OnPasteButtonClick">+ <StackPanel Orientation="Horizontal" Spacing="4">+ <FontIcon Glyph=""/>+ <TextBlock VerticalAlignment="Center" Text="{Binding Instance.Common.Paste, Mode=OneTime, Source={StaticResource LanguageManager}}"/>+ </StackPanel>+ </Button>+ <Button+ x:Name="OpenFileButton"+ ToolTipService.ToolTip="{Binding Instance.Common.OpenFile, Mode=OneTime, Source={StaticResource LanguageManager}}"+ Click="OnOpenFileButtonClick">+ <FontIcon Glyph=""/>+ </Button>+ <Button+ x:Name="ClearButton"+ ToolTipService.ToolTip="{Binding Instance.Common.Clear, Mode=OneTime, Source={StaticResource LanguageManager}}"+ Click="OnClearButtonClick">+ <FontIcon Glyph=""/>+ </Button>+ </StackPanel>++ <local:TextEditorCore+ x:Name="TextEditorCore"+ Grid.Row="1"+ Grid.ColumnSpan="2"+ SettingsProvider="{x:Bind SettingsProvider}"+ Text="{x:Bind Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>+ </Grid>+</UserControl>diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.csnew file mode 100644index 000000000..860d032cb--- /dev/null+++ b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs@@ -0,0 +1,99 @@+#nullable enable++using DevTools.Core.Settings;+using System;+using Windows.Storage;+using Windows.Storage.Pickers;+using Windows.UI.Xaml;+using Windows.UI.Xaml.Controls;++namespace DevTools.Common.UI.Controls.TextEditor+{+ public sealed partial class TextEditor : UserControl+ {+ public static readonly DependencyProperty SettingsProviderProperty+ = DependencyProperty.Register(+ nameof(SettingsProvider),+ typeof(ISettingsProvider),+ typeof(TextEditor),+ new PropertyMetadata(null));++ public ISettingsProvider? SettingsProvider+ {+ get => (ISettingsProvider?)GetValue(SettingsProviderProperty);+ set => SetValue(SettingsProviderProperty, value);+ }++ public static readonly DependencyProperty TextProperty+ = DependencyProperty.Register(+ nameof(Text),+ typeof(string),+ typeof(TextEditor),+ new PropertyMetadata(null));++ public string? Text+ {+ get => (string?)GetValue(TextProperty);+ set => SetValue(TextProperty, value);+ }++ public static readonly DependencyProperty HeaderProperty+ = DependencyProperty.Register(+ nameof(Header),+ typeof(object),+ typeof(TextEditor),+ new PropertyMetadata(null));++ public object Header+ {+ get => (object)GetValue(HeaderProperty);+ set => SetValue(HeaderProperty, value);+ }++ public TextEditor()+ {+ this.InitializeComponent();+ }++ private void OnPasteButtonClick(object sender, RoutedEventArgs e)+ {+ TextEditorCore.PasteCommand.Execute(null);+ }++ private async void OnOpenFileButtonClick(object sender, RoutedEventArgs e)+ {+ var filePicker = new FileOpenPicker+ {+ ViewMode = PickerViewMode.List,+ SuggestedStartLocation = PickerLocationId.ComputerFolder+ };++ filePicker.FileTypeFilter.Add("*");++ StorageFile file = await filePicker.PickSingleFileAsync();+ if (file is not null)+ {+ try+ {+ string text = await FileIO.ReadTextAsync(file);+ await Dispatcher.RunAsync(+ Windows.UI.Core.CoreDispatcherPriority.Normal,+ () =>+ {+ Text = text;+ TextEditorCore.Document.Selection.StartPosition = 0;+ });+ }+ catch+ {+ // TODO: Show a modal explaining the user that we can't read the file. Maybe it's not a text file.+ }+ }+ }++ private void OnClearButtonClick(object sender, RoutedEventArgs e)+ {+ Text = string.Empty;+ }+ }+}diff --git a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.cs b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditorCore.cssimilarity index 98%rename from src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.csrename to src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditorCore.csindex c7345a08b..60c45787e 100644--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.cs+++ b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditorCore.cs@@ -30,7 +30,7 @@ namespace DevTools.Common.UI.Controls.TextEditor[TemplatePart(Name = LineHighlighterAndIndicatorCanvasName, Type = typeof(Canvas))][TemplatePart(Name = LineHighlighterName, Type = typeof(Grid))][TemplatePart(Name = LineIndicatorName, Type = typeof(Border))]- public sealed class TextEditor : RichEditBox+ public sealed class TextEditorCore : RichEditBox{private const string ContentElementName = "ContentElement";private const string RootGridName = "RootGrid";@@ -75,7 +75,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(SettingsProvider),typeof(ISettingsProvider),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null, OnSettingsProviderPropertyChangedCallback));public ISettingsProvider? SettingsProvider@@ -88,7 +88,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(Text),typeof(string),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null, OnTextPropertyChangedCallback));public string? Text@@ -97,9 +97,9 @@ namespace DevTools.Common.UI.Controls.TextEditorset => SetValue(TextProperty, value);}- public TextEditor()+ public TextEditorCore(){- DefaultStyleKey = typeof(TextEditor);+ DefaultStyleKey = typeof(TextEditorCore);DataContext = this;IsSpellCheckEnabled = false;@@ -156,7 +156,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(CutCommand),typeof(IRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IRelayCommand CutCommand@@ -183,7 +183,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(CopyCommand),typeof(IRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IRelayCommand CopyCommand@@ -210,7 +210,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(PasteCommand),typeof(IAsyncRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IAsyncRelayCommand PasteCommand@@ -237,7 +237,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(DeleteCommand),typeof(IRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IRelayCommand DeleteCommand@@ -266,7 +266,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(UndoCommand),typeof(IRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IRelayCommand UndoCommand@@ -293,7 +293,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(RedoCommand),typeof(IRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IRelayCommand RedoCommand@@ -320,7 +320,7 @@ namespace DevTools.Common.UI.Controls.TextEditor= DependencyProperty.Register(nameof(SelectAllCommand),typeof(IRelayCommand),- typeof(TextEditor),+ typeof(TextEditorCore),new PropertyMetadata(null));public IRelayCommand SelectAllCommand@@ -1017,7 +1017,7 @@ namespace DevTools.Common.UI.Controls.TextEditorISettingsProvider? settingProvider = e.NewValue as ISettingsProvider;if (settingProvider is not null){- var textEditorCore = (TextEditor)d;+ var textEditorCore = (TextEditorCore)d;settingProvider.SettingChanged += textEditorCore.SettingProvider_SettingChanged;textEditorCore.ApplySettings();}@@ -1026,7 +1026,7 @@ namespace DevTools.Common.UI.Controls.TextEditorprivate static void OnTextPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e){string? text = e.NewValue as string;- var textEditorCore = (TextEditor)d;+ var textEditorCore = (TextEditorCore)d;if (!textEditorCore._isTextPendingUpdate)diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xamlindex 8a7ae094e..f1ae10ccd 100644--- a/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/JsonFormatter/JsonFormatterToolPage.xaml@@ -46,7 +46,9 @@</Grid.ColumnDefinitions><texteditor:TextEditor- Grid.Column="0"/>+ Grid.Column="0"+ Header="Input"+ Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/><toolkit:GridSplitterGrid.Column="1"@@ -62,7 +64,8 @@</toolkit:GridSplitter><formattedtextblock:FormattedTextBlock- Grid.Column="2"/>+ Grid.Column="2"+ Header="Output"/></Grid></Grid></Page>