Skip to content

A Swiss Army knife for developers.

Made the UI more responsive.

Etienne Baudoux4c0b1abea6c4
diff --git a/src/dev/impl/DevTools.Common/DevTools.Common.csproj b/src/dev/impl/DevTools.Common/DevTools.Common.csproj
index ee8296529..e450d929e 100644
--- a/src/dev/impl/DevTools.Common/DevTools.Common.csproj
+++ b/src/dev/impl/DevTools.Common/DevTools.Common.csproj
@@ -122,6 +122,7 @@
<Compile Include="UI\Converters\NullToBooleanConverter.cs" />
<Compile Include="UI\Extensions\Axis.cs" />
<Compile Include="UI\Extensions\HighlighterExtension.cs" />
+ <Compile Include="UI\Extensions\IsCompactOverlayModeTrigger.cs" />
<Compile Include="UI\Extensions\ScrollViewerExtensions.cs" />
<Content Include="Assets\Icons\Idea.svg" />
<Content Include="LanguageManager.tt">
diff --git a/src/dev/impl/DevTools.Common/LanguageManager.cs b/src/dev/impl/DevTools.Common/LanguageManager.cs
index 362016699..f7ed958e1 100644
--- a/src/dev/impl/DevTools.Common/LanguageManager.cs
+++ b/src/dev/impl/DevTools.Common/LanguageManager.cs
@@ -304,6 +304,24 @@ namespace DevTools.Common
/// Gets the resource Search.
/// </summary>
public string Search => _resources.GetString("Search");
+
+ /// <summary>
+ /// Gets the resource WindowTitle.
+ /// </summary>
+ public string WindowTitle => _resources.GetString("WindowTitle");
+
+ /// <summary>
+ /// Gets the resource WindowTitleWithToolName.
+ /// </summary>
+ public string WindowTitleWithToolName => _resources.GetString("WindowTitleWithToolName");
+
+ /// <summary>
+ /// Gets the resource WindowTitleWithToolName with format.
+ /// </summary>
+ public string GetFormattedWindowTitleWithToolName(string param0)
+ {
+ return string.Format(WindowTitleWithToolName, param0);
+ }
}
public class RegExStrings : ObservableObject
diff --git a/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw b/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
index d7b0ead59..a634808f9 100644
--- a/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
+++ b/src/dev/impl/DevTools.Common/Strings/en/MainPage.resw
@@ -129,4 +129,10 @@
<data name="Search" xml:space="preserve">
<value>Type to search for tools...</value>
</data>
+ <data name="WindowTitle" xml:space="preserve">
+ <value>DevTools</value>
+ </data>
+ <data name="WindowTitleWithToolName" xml:space="preserve">
+ <value>DevTools - {0}</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml b/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml
index 520d125e5..3708c90e8 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml
+++ b/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml
@@ -9,7 +9,8 @@
xmlns:converters="using:DevTools.Common.UI.Converters"
mc:Ignorable="d"
d:DesignHeight="24"
- d:DesignWidth="200">
+ d:DesignWidth="200"
+ SizeChanged="UserControl_SizeChanged">
<UserControl.Resources>
<common:LanguageManager x:Key="LanguageManager"/>
@@ -40,6 +41,7 @@
VerticalAlignment="Bottom"
Visibility="Collapsed"/>
<StackPanel
+ x:Name="CommandsToolBar"
Grid.Row="0"
Grid.Column="1"
Orientation="Horizontal"
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs
index dceb6d908..4600f2a0f 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs
+++ b/src/dev/impl/DevTools.Common/UI/Controls/CustomTextBox.xaml.cs
@@ -482,6 +482,18 @@ namespace DevTools.Common.UI.Controls
}
}
+ private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ if (e.NewSize.Width < CommandsToolBar.ActualWidth + 100)
+ {
+ CommandsToolBar.Visibility = Visibility.Collapsed;
+ }
+ else
+ {
+ CommandsToolBar.Visibility = Visibility.Visible;
+ }
+ }
+
private static void OnIsReadOnlyPropertyChangedCalled(DependencyObject sender, DependencyPropertyChangedEventArgs eventArgs)
{
((CustomTextBox)sender).UpdateUI();
diff --git a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml b/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
index d996647a6..051e4c05a 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
+++ b/src/dev/impl/DevTools.Common/UI/Controls/FormattedTextBlock/FormattedTextBlock.xaml
@@ -7,7 +7,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
d:DesignHeight="300"
- d:DesignWidth="400">
+ d:DesignWidth="400"
+ SizeChanged="UserControl_SizeChanged">
<Grid>
<Grid.RowDefinitions>
@@ -78,6 +79,7 @@
VerticalAlignment="Bottom"
Visibility="Collapsed"/>
<StackPanel
+ x:Name="CommandsToolBar"
Grid.Row="0"
Grid.Column="1"
Orientation="Horizontal"
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.cs
index 612c6699f..b523473fa 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
@@ -529,6 +529,18 @@ namespace DevTools.Common.UI.Controls.FormattedTextBlock
Clipboard.SetContent(data);
}
+ private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ if (e.NewSize.Width < CommandsToolBar.ActualWidth + 100)
+ {
+ CommandsToolBar.Visibility = Visibility.Collapsed;
+ }
+ else
+ {
+ CommandsToolBar.Visibility = Visibility.Visible;
+ }
+ }
+
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.xaml
index d248794b1..a4f4ee4c4 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml
+++ b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml
@@ -8,7 +8,8 @@
xmlns:local="using:DevTools.Common.UI.Controls.TextEditor"
mc:Ignorable="d"
d:DesignHeight="300"
- d:DesignWidth="400">
+ d:DesignWidth="400"
+ SizeChanged="UserControl_SizeChanged">
<UserControl.Resources>
<common:LanguageManager x:Key="LanguageManager"/>
</UserControl.Resources>
@@ -37,6 +38,7 @@
VerticalAlignment="Bottom">
</ContentPresenter>
<StackPanel
+ x:Name="CommandsToolBar"
Grid.Row="0"
Grid.Column="1"
Orientation="Horizontal"
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.cs
index 860d032cb..1882f04fa 100644
--- a/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs
+++ b/src/dev/impl/DevTools.Common/UI/Controls/TextEditor/TextEditor.xaml.cs
@@ -95,5 +95,17 @@ namespace DevTools.Common.UI.Controls.TextEditor
{
Text = string.Empty;
}
+
+ private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ if (e.NewSize.Width < CommandsToolBar.ActualWidth + 100)
+ {
+ CommandsToolBar.Visibility = Visibility.Collapsed;
+ }
+ else
+ {
+ CommandsToolBar.Visibility = Visibility.Visible;
+ }
+ }
}
}
diff --git a/src/dev/impl/DevTools.Common/UI/Extensions/IsCompactOverlayModeTrigger.cs b/src/dev/impl/DevTools.Common/UI/Extensions/IsCompactOverlayModeTrigger.cs
new file mode 100644
index 000000000..28cecea01
--- /dev/null
+++ b/src/dev/impl/DevTools.Common/UI/Extensions/IsCompactOverlayModeTrigger.cs
@@ -0,0 +1,38 @@
+#nullable enable
+
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+
+namespace DevTools.Common.UI.Extensions
+{
+ public sealed class IsCompactOverlayModeTrigger : StateTriggerBase
+ {
+ private FrameworkElement? _targetElement;
+
+ public FrameworkElement? TargetElement
+ {
+ get
+ {
+ return _targetElement;
+ }
+ set
+ {
+ if (_targetElement is not null)
+ {
+ _targetElement.SizeChanged -= OnSizeChanged;
+ }
+ _targetElement = value;
+ if (_targetElement is not null)
+ {
+ _targetElement.SizeChanged += OnSizeChanged;
+ }
+ }
+ }
+
+ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ var view = ApplicationView.GetForCurrentView();
+ SetActive(view.ViewMode == ApplicationViewMode.CompactOverlay);
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
index a0c4fb428..802f7a45d 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
@@ -84,12 +84,45 @@ namespace DevTools.Impl.ViewModels
IToolViewModel toolViewModel = _toolProviderFactory.GetToolViewModel(_selectedItem.ToolProvider);
Messenger.Send(new NavigateToToolMessage(toolViewModel));
- OnPropertyChanged(nameof(SelectedMenuItem));
+ OnPropertyChanged();
+ OnPropertyChanged(nameof(HeaderText));
}
_isUpdatingSelectedItem = false;
}
}
+ /// <summary>
+ /// Gets the text to show in the header of the app. The property returned null when is in compact overlay mode.
+ /// </summary>
+ internal string? HeaderText
+ {
+ get
+ {
+ if (IsInCompactOverlayMode)
+ {
+ return null;
+ }
+
+ return SelectedMenuItem?.ToolProvider.DisplayName;
+ }
+ }
+
+ /// <summary>
+ /// Gets the text to show in the header of the app. The property returned null when is in compact overlay mode.
+ /// </summary>
+ internal string? WindowTitle
+ {
+ get
+ {
+ if (IsInCompactOverlayMode)
+ {
+ return Strings.GetFormattedWindowTitleWithToolName(SelectedMenuItem?.ToolProvider.DisplayName);
+ }
+
+ return Strings.WindowTitle;
+ }
+ }
+
/// <summary>
/// Gets or sets search query in the search bar.
/// </summary>
@@ -121,6 +154,8 @@ namespace DevTools.Impl.ViewModels
{
_isInCompactOverlayMode = value;
OnPropertyChanged();
+ OnPropertyChanged(nameof(HeaderText));
+ OnPropertyChanged(nameof(WindowTitle));
}
}
}
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
index 87bf498d8..20c5df508 100644
--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml
@@ -12,12 +12,11 @@
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
xmlns:i="using:Microsoft.Xaml.Interactivity"
- xmlns:sys="using:System"
xmlns:viewmanagement="using:Windows.UI.ViewManagement"
mc:Ignorable="d"
NavigationCacheMode="Enabled"
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True">
- <Page.Resources>
+ <Page.Resources>
<converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter"/>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
<converters:BooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" IsInverted="True"/>
@@ -63,7 +62,7 @@
Height="16"
Visibility="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
<TextBlock
- Text="DevTools"
+ Text="{x:Bind ViewModel.WindowTitle, Mode=OneWay}"
VerticalAlignment="Center"
Margin="12,0,0,0"
Style="{StaticResource CaptionTextBlockStyle}" />
@@ -146,7 +145,7 @@
IsTabStop="False"
AlwaysShowHeader="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanConverter}}"
IsPaneVisible="{x:Bind ViewModel.IsInCompactOverlayMode, Mode=OneWay, Converter={StaticResource InvertedBooleanConverter}}"
- Header="{x:Bind ViewModel.SelectedMenuItem.ToolProvider.DisplayName, Mode=OneWay}"
+ Header="{x:Bind ViewModel.HeaderText, Mode=OneWay}"
MenuItemsSource="{x:Bind ViewModel.ToolsMenuItems}"
FooterMenuItemsSource="{x:Bind ViewModel.FooterMenuItems}"
SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
index 2ef0ddcb8..437f2ee31 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml
@@ -5,10 +5,24 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:DevTools.Common.UI.Controls"
+ xmlns:ex="using:DevTools.Common.UI.Extensions"
mc:Ignorable="d"
NavigationCacheMode="Required">
<Grid RowSpacing="4" Margin="0,0,0,16">
+ <VisualStateManager.VisualStateGroups>
+ <VisualStateGroup>
+ <VisualState>
+ <VisualState.StateTriggers>
+ <ex:IsCompactOverlayModeTrigger TargetElement="{x:Bind}" />
+ </VisualState.StateTriggers>
+ <VisualState.Setters>
+ <Setter Target="EncodingSetting.Visibility" Value="Collapsed" />
+ </VisualState.Setters>
+ </VisualState>
+ </VisualStateGroup>
+ </VisualStateManager.VisualStateGroups>
+
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@@ -32,6 +46,7 @@
</ComboBox>
</controls:ExpandableSettingControl>
<controls:ExpandableSettingControl
+ x:Name="EncodingSetting"
Grid.Row="2"
Title="{x:Bind ViewModel.Strings.EncodingTitle}"
Description="{x:Bind ViewModel.Strings.EncodingDescription}">
@@ -49,12 +64,14 @@
<controls:CustomTextBox
Grid.Row="1"
+ MinHeight="150"
AcceptsReturn="True"
Header="{x:Bind ViewModel.Strings.InputTitle}"
Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<controls:CustomTextBox
Grid.Row="2"
+ MinHeight="150"
IsReadOnly="True"
AcceptsReturn="True"
Header="{x:Bind ViewModel.Strings.OutputTitle}"
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
index ab123eb7f..a79a2c491 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/Base64EncoderDecoder/Base64EncoderDecoderToolProvider.cs
@@ -14,7 +14,6 @@ namespace DevTools.Providers.Impl.Tools.Base64EncoderDecoder
[Name("Base64 Encoder/Decoder")]
[ProtocolName("base64")]
[Order(0)]
- [NotScrollable]
internal sealed class Base64EncoderDecoderToolProvider : ToolProviderBase, IToolProvider
{
public string DisplayName => LanguageManager.Instance.Base64EncoderDecoder.DisplayName;
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml
index 76d2178c8..534c065a9 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolPage.xaml
@@ -8,7 +8,7 @@
mc:Ignorable="d"
NavigationCacheMode="Required">
- <StackPanel Spacing="12">
+ <StackPanel Margin="0,0,0,16" Spacing="12">
<StackPanel.ChildrenTransitions>
<TransitionCollection>
<EntranceThemeTransition IsStaggeringEnabled="True" FromVerticalOffset="50"/>
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs
index 2492458ff..61b37873a 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/HashGenerator/HashGeneratorToolProvider.cs
@@ -13,6 +13,7 @@ namespace DevTools.Providers.Impl.Tools.HashGenerator
[Name("Hash Generator")]
[ProtocolName("hash")]
[Order(0)]
+ [CompactOverlaySize(width: 400, height: 500)]
internal sealed class HashGeneratorToolProvider : ToolProviderBase, IToolProvider
{
private readonly IThread _thread;
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml
index 3a0f34126..58b66f4d2 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolPage.xaml
@@ -6,11 +6,33 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:formattedtextblock="using:DevTools.Common.UI.Controls.FormattedTextBlock"
xmlns:texteditor="using:DevTools.Common.UI.Controls.TextEditor"
- xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
+ xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:ex="using:DevTools.Common.UI.Extensions"
mc:Ignorable="d"
NavigationCacheMode="Required">
<Grid Margin="0,0,0,16">
+ <VisualStateManager.VisualStateGroups>
+ <VisualStateGroup>
+ <VisualState>
+ <VisualState.StateTriggers>
+ <ex:IsCompactOverlayModeTrigger TargetElement="{x:Bind}" />
+ </VisualState.StateTriggers>
+ <VisualState.Setters>
+ <Setter Target="InputGridSplitter.Visibility" Value="Collapsed"/>
+ <Setter Target="OutputGridSplitter.Visibility" Value="Collapsed"/>
+ <Setter Target="HorizontalGridSplitterRow.Height" Value="16" />
+ <Setter Target="HorizontalRightTextEditorRow.Height" Value="*" />
+ <Setter Target="HorizontalRightTextEditorRow.MinHeight" Value="200" />
+ <Setter Target="HorizontalGridSplitterColumn.Width" Value="Auto" />
+ <Setter Target="HorizontalRightTextEditorColumn.MinWidth" Value="0" />
+ <Setter Target="HorizontalRightTextEditorColumn.Width" Value="Auto" />
+ <Setter Target="RightTextEditor.(Grid.Column)" Value="0" />
+ <Setter Target="RightTextEditor.(Grid.Row)" Value="2" />
+ </VisualState.Setters>
+ </VisualState>
+ </VisualStateGroup>
+ </VisualStateManager.VisualStateGroups>
+
<Grid.ChildrenTransitions>
<TransitionCollection>
<EntranceThemeTransition IsStaggeringEnabled="True" FromVerticalOffset="50"/>
@@ -18,26 +40,36 @@
</Grid.ChildrenTransitions>
<Grid.RowDefinitions>
- <RowDefinition MinHeight="100"/>
+ <RowDefinition MinHeight="200"/>
<RowDefinition Height="16"/>
- <RowDefinition MinHeight="100"/>
+ <RowDefinition MinHeight="200"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
- <ColumnDefinition MinWidth="100"/>
- <ColumnDefinition Width="16"/>
- <ColumnDefinition MinWidth="100"/>
+ <ColumnDefinition MinWidth="150"/>
+ <ColumnDefinition x:Name="HorizontalGridSplitterColumn" Width="16"/>
+ <ColumnDefinition x:Name="HorizontalRightTextEditorColumn" MinWidth="150"/>
</Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition MinHeight="200"/>
+ <RowDefinition x:Name="HorizontalGridSplitterRow" Height="0"/>
+ <RowDefinition x:Name="HorizontalRightTextEditorRow" Height="0"/>
+ </Grid.RowDefinitions>
<texteditor:TextEditor
+ x:Name="LeftTextEditor"
Grid.Column="0"
+ Grid.Row="0"
+ MinHeight="200"
SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Header="{x:Bind ViewModel.Strings.LeftText}"
Text="{x:Bind ViewModel.OldText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<toolkit:GridSplitter
+ x:Name="InputGridSplitter"
Grid.Column="1"
+ Grid.Row="0"
Width="16"
Margin="0,42,0,0"
ResizeBehavior="BasedOnAlignment"
@@ -50,13 +82,17 @@
</toolkit:GridSplitter>
<texteditor:TextEditor
+ x:Name="RightTextEditor"
Grid.Column="2"
+ Grid.Row="0"
+ MinHeight="200"
SettingsProvider="{x:Bind ViewModel.SettingsProvider}"
Header="{x:Bind ViewModel.Strings.RightText}"
Text="{x:Bind ViewModel.NewText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
<toolkit:GridSplitter
+ x:Name="OutputGridSplitter"
Grid.Row="1"
Height="16"
ResizeBehavior="BasedOnAlignment"
@@ -70,6 +106,7 @@
<formattedtextblock:FormattedTextBlock
x:Name="OuputTextEditor"
+ MinHeight="200"
Grid.Row="2"
Header="{x:Bind ViewModel.Strings.Difference}"
SettingsProvider="{x:Bind ViewModel.SettingsProvider}"/>
diff --git a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs
index cdaf1e9cf..81979e4d4 100644
--- a/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs
+++ b/src/dev/impl/DevTools.Providers.Impl/Tools/TextDiff/TextDiffToolProvider.cs
@@ -11,7 +11,6 @@ namespace DevTools.Providers.Impl.Tools.TextDiff
[Name("Text Diff")]
[ProtocolName("diff")]
[Order(0)]
- [NotScrollable]
internal sealed class TextDiffToolProvider : ToolProviderBase, IToolProvider
{
private readonly IMefProvider _mefProvider;