Skip to content

A Swiss Army knife for developers.

Fixed an issue where the clipboard content isn't preserved after shutting down the app.

Etienne Baudouxfed38af0ac0f
diff --git a/src/dev/impl/DevToys/App.xaml.cs b/src/dev/impl/DevToys/App.xaml.cs
index a8aa0d248..fc0df99eb 100644
--- a/src/dev/impl/DevToys/App.xaml.cs
+++ b/src/dev/impl/DevToys/App.xaml.cs
@@ -187,6 +187,18 @@ namespace DevToys
{
var deferral = e.SuspendingOperation.GetDeferral();
//TODO: Save application state and stop any background activity
+
+ try
+ {
+ // Bug #22: Here we flush the Clipboard to make sure content in clipboard to remain available
+ // after the application shuts down.
+ Windows.ApplicationModel.DataTransfer.Clipboard.Flush();
+ }
+ catch (Exception)
+ {
+ // ignore
+ }
+
deferral.Complete();
}
diff --git a/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
index 226a8e44a..f9a325e20 100644
--- a/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
@@ -337,7 +337,8 @@ namespace DevToys.UI.Controls
};
data.SetText(Text ?? string.Empty);
- Clipboard.SetContent(data);
+ Clipboard.SetContentWithOptions(data, new ClipboardContentOptions() { IsAllowedInHistory = true, IsRoamable = true });
+ Clipboard.Flush();
}
private async void OpenFileButton_Click(object sender, RoutedEventArgs e)
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
index aae9b58f5..700493ca6 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml
@@ -100,7 +100,9 @@
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}"/>
+ Text="{x:Bind Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ CopyingToClipboard="TextBox_CopyingToClipboard"
+ CuttingToClipboard="TextBox_CuttingToClipboard"/>
<RichEditBox
x:Name="RichEditBox"
x:Load="{x:Bind IsRichTextEdit}"
@@ -111,7 +113,9 @@
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}">
+ AcceptsReturn="{x:Bind AcceptsReturn, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ CopyingToClipboard="RichEditBox_CopyingToClipboard"
+ CuttingToClipboard="RichEditBox_CuttingToClipboard">
<RichEditBox.ContextFlyout>
<MenuFlyout>
<MenuFlyoutItem
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
index 23fc7c631..bba09232f 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -132,6 +132,7 @@ namespace DevToys.UI.Controls
private void ExecuteCopyCommand()
{
RichEditBox.TextDocument.Selection.Copy();
+ Clipboard.Flush();
}
#endregion
@@ -377,6 +378,23 @@ namespace DevToys.UI.Controls
return (RichEditBox)(RichEditBox ?? FindName(nameof(RichEditBox)));
}
+ private void CopyTextBoxSelectionToClipboard()
+ {
+ DataPackage dataPackage = new DataPackage { RequestedOperation = DataPackageOperation.Copy };
+ dataPackage.SetText(TextBox.SelectedText);
+ Clipboard.SetContentWithOptions(dataPackage, new ClipboardContentOptions() { IsAllowedInHistory = true, IsRoamable = true });
+ Clipboard.Flush(); // This method allows the content to remain available after the application shuts down.
+ }
+
+ private void CopyRichEditBoxSelectionToClipboard()
+ {
+ RichEditBox.Document.Selection.GetText(TextGetOptions.UseCrlf, out string text);
+ DataPackage dataPackage = new DataPackage { RequestedOperation = DataPackageOperation.Copy };
+ dataPackage.SetText(text);
+ Clipboard.SetContentWithOptions(dataPackage, new ClipboardContentOptions() { IsAllowedInHistory = true, IsRoamable = true });
+ Clipboard.Flush(); // This method allows the content to remain available after the application shuts down.
+ }
+
private void OnLoaded(object sender, RoutedEventArgs e)
{
UpdateUI();
@@ -431,7 +449,8 @@ namespace DevToys.UI.Controls
};
data.SetText(Text);
- Clipboard.SetContent(data);
+ Clipboard.SetContentWithOptions(data, new ClipboardContentOptions() { IsAllowedInHistory = true, IsRoamable = true });
+ Clipboard.Flush(); // This method allows the content to remain available after the application shuts down.
}
private async void OpenFileButton_Click(object sender, RoutedEventArgs e)
@@ -484,6 +503,30 @@ namespace DevToys.UI.Controls
}
}
+ private void TextBox_CopyingToClipboard(TextBox sender, TextControlCopyingToClipboardEventArgs args)
+ {
+ CopyTextBoxSelectionToClipboard();
+ args.Handled = true;
+ }
+
+ private void TextBox_CuttingToClipboard(TextBox sender, TextControlCuttingToClipboardEventArgs args)
+ {
+ CopyTextBoxSelectionToClipboard();
+ args.Handled = true;
+ }
+
+ private void RichEditBox_CopyingToClipboard(RichEditBox sender, TextControlCopyingToClipboardEventArgs args)
+ {
+ CopyRichEditBoxSelectionToClipboard();
+ args.Handled = true;
+ }
+
+ private void RichEditBox_CuttingToClipboard(RichEditBox sender, TextControlCuttingToClipboardEventArgs args)
+ {
+ CopyRichEditBoxSelectionToClipboard();
+ args.Handled = true;
+ }
+
private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (e.NewSize.Width < CommandsToolBar.ActualWidth + 100)
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
index 6b1405cfe..9400abc1b 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Settings/SettingsToolViewModel.cs
@@ -140,7 +140,8 @@ namespace DevToys.ViewModels.Settings
};
data.SetText(Version);
- Clipboard.SetContent(data);
+ Clipboard.SetContentWithOptions(data, new ClipboardContentOptions() { IsAllowedInHistory = true, IsRoamable = true });
+ Clipboard.Flush();
}
#endregion