Skip to content

A Swiss Army knife for developers.

Adjusted auto resize of CustomTextBox

Etienne Baudoux517a7e2eda56
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
index 700493ca6..1a978ef69 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
@@ -89,107 +89,124 @@
</StackPanel>
</Button>
</StackPanel>
- <TextBox
- x:Name="TextBox"
- x:Load="{x:Bind IsRichTextEdit, Converter={StaticResource InvertedBooleanConverter}}"
+ <Border
+ x:Name="InputSizeFit"
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
- TabIndex="1"
- IsSpellCheckEnabled="False"
- TextWrapping="{x:Bind AcceptsReturn, Mode=OneWay, Converter={StaticResource BooleanToTextWrappingConverter}}"
- IsReadOnly="{x:Bind IsReadOnly, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- AcceptsReturn="{x:Bind AcceptsReturn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- Text="{x:Bind Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- CopyingToClipboard="TextBox_CopyingToClipboard"
- CuttingToClipboard="TextBox_CuttingToClipboard"/>
- <RichEditBox
- x:Name="RichEditBox"
- x:Load="{x:Bind IsRichTextEdit}"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ SizeChanged="InputSizeFit_SizeChanged"/>
+ <Canvas
Grid.Row="1"
Grid.Column="0"
- Grid.ColumnSpan="2"
- TabIndex="1"
- IsSpellCheckEnabled="False"
- TextWrapping="{x:Bind AcceptsReturn, Mode=OneWay, Converter={StaticResource BooleanToTextWrappingConverter}}"
- IsReadOnly="{x:Bind IsReadOnly, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- AcceptsReturn="{x:Bind AcceptsReturn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- CopyingToClipboard="RichEditBox_CopyingToClipboard"
- CuttingToClipboard="RichEditBox_CuttingToClipboard">
- <RichEditBox.ContextFlyout>
- <MenuFlyout>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.Cut, Source={StaticResource LanguageManager}}"
- Command="{Binding CutCommand}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF33A;" />
- </MenuFlyoutItem.Icon>
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="X" Modifiers="Control" IsEnabled="False"/>
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.Copy, Source={StaticResource LanguageManager}}"
- Command="{Binding CopyCommand}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF32B;" />
- </MenuFlyoutItem.Icon>
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="C" Modifiers="Control" IsEnabled="False"/>
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.Paste, Source={StaticResource LanguageManager}}"
- Command="{Binding PasteCommand}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF2D5;" />
- </MenuFlyoutItem.Icon>
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="V" Modifiers="Control" IsEnabled="False"/>
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.Delete, Source={StaticResource LanguageManager}}"
- Command="{Binding DeleteCommand}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF34C;" />
- </MenuFlyoutItem.Icon>
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="Delete" IsEnabled="False" />
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- <MenuFlyoutSeparator/>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.Undo, Source={StaticResource LanguageManager}}"
- Command="{Binding UndoCommand}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF199;" />
- </MenuFlyoutItem.Icon>
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="Z" Modifiers="Control" IsEnabled="False" />
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.Redo, Source={StaticResource LanguageManager}}"
- Command="{Binding RedoCommand}">
- <MenuFlyoutItem.Icon>
- <FontIcon Glyph="&#xF16E;" />
- </MenuFlyoutItem.Icon>
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="Y" Modifiers="Control" IsEnabled="False" />
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- <MenuFlyoutSeparator/>
- <MenuFlyoutItem
- Text="{Binding Instance.Common.SelectAll, Source={StaticResource LanguageManager}}"
- Command="{Binding SelectAllCommand}">
- <MenuFlyoutItem.KeyboardAccelerators>
- <KeyboardAccelerator Key="A" Modifiers="Control" IsEnabled="False" />
- </MenuFlyoutItem.KeyboardAccelerators>
- </MenuFlyoutItem>
- </MenuFlyout>
- </RichEditBox.ContextFlyout>
- </RichEditBox>
+ Grid.ColumnSpan="2">
+ <TextBox
+ x:Name="TextBox"
+ x:Load="{x:Bind IsRichTextEdit, Converter={StaticResource InvertedBooleanConverter}}"
+ TabIndex="1"
+ IsSpellCheckEnabled="False"
+ ScrollViewer.VerticalScrollMode="Enabled"
+ ScrollViewer.VerticalScrollBarVisibility="Auto"
+ ScrollViewer.HorizontalScrollMode="Enabled"
+ ScrollViewer.HorizontalScrollBarVisibility="Auto"
+ TextWrapping="{x:Bind AcceptsReturn, Mode=OneWay, Converter={StaticResource BooleanToTextWrappingConverter}}"
+ IsReadOnly="{x:Bind IsReadOnly, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ AcceptsReturn="{x:Bind AcceptsReturn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ Text="{x:Bind Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ SelectionChanged="TextBox_SelectionChanged"
+ CopyingToClipboard="TextBox_CopyingToClipboard"
+ CuttingToClipboard="TextBox_CuttingToClipboard"/>
+ <RichEditBox
+ x:Name="RichEditBox"
+ x:Load="{x:Bind IsRichTextEdit}"
+ TabIndex="1"
+ IsSpellCheckEnabled="False"
+ ScrollViewer.VerticalScrollMode="Enabled"
+ ScrollViewer.VerticalScrollBarVisibility="Auto"
+ ScrollViewer.HorizontalScrollMode="Enabled"
+ ScrollViewer.HorizontalScrollBarVisibility="Auto"
+ TextWrapping="{x:Bind AcceptsReturn, Mode=OneWay, Converter={StaticResource BooleanToTextWrappingConverter}}"
+ IsReadOnly="{x:Bind IsReadOnly, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ AcceptsReturn="{x:Bind AcceptsReturn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ SelectionChanged="RichEditBox_SelectionChanged"
+ CopyingToClipboard="RichEditBox_CopyingToClipboard"
+ CuttingToClipboard="RichEditBox_CuttingToClipboard">
+ <RichEditBox.ContextFlyout>
+ <MenuFlyout>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.Cut, Source={StaticResource LanguageManager}}"
+ Command="{Binding CutCommand}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF33A;" />
+ </MenuFlyoutItem.Icon>
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="X" Modifiers="Control" IsEnabled="False"/>
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.Copy, Source={StaticResource LanguageManager}}"
+ Command="{Binding CopyCommand}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF32B;" />
+ </MenuFlyoutItem.Icon>
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="C" Modifiers="Control" IsEnabled="False"/>
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.Paste, Source={StaticResource LanguageManager}}"
+ Command="{Binding PasteCommand}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF2D5;" />
+ </MenuFlyoutItem.Icon>
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="V" Modifiers="Control" IsEnabled="False"/>
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.Delete, Source={StaticResource LanguageManager}}"
+ Command="{Binding DeleteCommand}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF34C;" />
+ </MenuFlyoutItem.Icon>
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="Delete" IsEnabled="False" />
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ <MenuFlyoutSeparator/>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.Undo, Source={StaticResource LanguageManager}}"
+ Command="{Binding UndoCommand}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF199;" />
+ </MenuFlyoutItem.Icon>
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="Z" Modifiers="Control" IsEnabled="False" />
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.Redo, Source={StaticResource LanguageManager}}"
+ Command="{Binding RedoCommand}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF16E;" />
+ </MenuFlyoutItem.Icon>
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="Y" Modifiers="Control" IsEnabled="False" />
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ <MenuFlyoutSeparator/>
+ <MenuFlyoutItem
+ Text="{Binding Instance.Common.SelectAll, Source={StaticResource LanguageManager}}"
+ Command="{Binding SelectAllCommand}">
+ <MenuFlyoutItem.KeyboardAccelerators>
+ <KeyboardAccelerator Key="A" Modifiers="Control" IsEnabled="False" />
+ </MenuFlyoutItem.KeyboardAccelerators>
+ </MenuFlyoutItem>
+ </MenuFlyout>
+ </RichEditBox.ContextFlyout>
+ </RichEditBox>
+ </Canvas>
<Button
x:Name="InlinedCopyButton"
x:DeferLoadStrategy="Lazy"
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
index 303a4fe08..957bdb401 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -86,6 +86,19 @@ namespace DevToys.UI.Controls
set => SetValue(TextProperty, value);
}
+ public static readonly DependencyProperty SelectionStartProperty
+ = DependencyProperty.Register(
+ nameof(SelectionStart),
+ typeof(int),
+ typeof(CustomTextBox),
+ new PropertyMetadata(0));
+
+ public int SelectionStart
+ {
+ get => (int)GetValue(SelectionStartProperty);
+ set => SetValue(SelectionStartProperty, value);
+ }
+
public CustomTextBox()
{
InitializeComponent();
@@ -516,6 +529,11 @@ namespace DevToys.UI.Controls
args.Handled = true;
}
+ private void TextBox_SelectionChanged(object sender, RoutedEventArgs e)
+ {
+ SelectionStart = TextBox.SelectionStart;
+ }
+
private void RichEditBox_CopyingToClipboard(RichEditBox sender, TextControlCopyingToClipboardEventArgs args)
{
CopyRichEditBoxSelectionToClipboard();
@@ -528,6 +546,11 @@ namespace DevToys.UI.Controls
args.Handled = true;
}
+ private void RichEditBox_SelectionChanged(object sender, RoutedEventArgs e)
+ {
+ SelectionStart = RichEditBox.Document.Selection.StartPosition;
+ }
+
private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (e.NewSize.Width < CommandsToolBar.ActualWidth + 100)
@@ -540,6 +563,23 @@ namespace DevToys.UI.Controls
}
}
+ private void InputSizeFit_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ if (TextBox is not null)
+ {
+ InputSizeFit.MinHeight = TextBox.MinHeight;
+ TextBox.Height = InputSizeFit.ActualHeight;
+ TextBox.Width = InputSizeFit.ActualWidth;
+ }
+
+ if (RichEditBox is not null)
+ {
+ InputSizeFit.MinHeight = RichEditBox.MinHeight;
+ RichEditBox.Height = InputSizeFit.ActualHeight;
+ RichEditBox.Width = InputSizeFit.ActualWidth;
+ }
+ }
+
private static void OnIsReadOnlyPropertyChangedCalled(DependencyObject sender, DependencyPropertyChangedEventArgs eventArgs)
{
((CustomTextBox)sender).UpdateUI();
diff --git a/src/dev/impl/DevToys/Views/MainPage.xaml b/src/dev/impl/DevToys/Views/MainPage.xaml
index 2abf4e6ae..f63543015 100644
--- a/src/dev/impl/DevToys/Views/MainPage.xaml
+++ b/src/dev/impl/DevToys/Views/MainPage.xaml
@@ -35,7 +35,7 @@
<Setter Target="NonCompactOverlayButton.Visibility" Value="Visible" />
<Setter Target="NavigationView.AlwaysShowHeader" Value="False" />
<Setter Target="NavigationView.IsPaneVisible" Value="False" />
- <Setter Target="ContentScrollViewer.Padding" Value="12,12,12,0"/>
+ <Setter Target="ContentScrollViewer.Padding" Value="12,0,12,0"/>
<Setter Target="HeaderTextBlock.Visibility" Value="Collapsed" />
</VisualState.Setters>
</VisualState>