From 452ceef285159b612f9cc84e39dc72014b630515 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Sat, 7 Jan 2023 23:27:28 -0700 Subject: [PATCH] Tweak --- .../LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs | 8 ++++---- Source/LibationWinForms/Dialogs/EditTemplateDialog.cs | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs index 98c001eb..3cb44efe 100644 --- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.Markup.Xaml; +using Avalonia.Markup.Xaml; using Avalonia.Media; using Dinah.Core; using LibationFileManager; @@ -50,11 +50,11 @@ namespace LibationAvalonia.Dialogs { var dataGrid = sender as DataGrid; - var item = dataGrid.SelectedItem as Tuple; + var item = (dataGrid.SelectedItem as Tuple).Item1.Replace("\x200C", "").Replace("...", ""); var text = userEditTbox.Text; - userEditTbox.Text = text.Insert(Math.Min(Math.Max(0, userEditTbox.CaretIndex), text.Length), item.Item1); - userEditTbox.CaretIndex += item.Item1.Length; + userEditTbox.Text = text.Insert(Math.Min(Math.Max(0, userEditTbox.CaretIndex), text.Length), item); + userEditTbox.CaretIndex += item.Length; } protected override async Task SaveAndCloseAsync() diff --git a/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs b/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs index 5167327d..d73dc769 100644 --- a/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs +++ b/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs @@ -5,7 +5,6 @@ using System.IO; using System.Windows.Forms; using Dinah.Core; using LibationFileManager; -using System.Windows.Controls; namespace LibationWinForms.Dialogs { @@ -60,7 +59,7 @@ namespace LibationWinForms.Dialogs // populate list view foreach (var tag in template.GetTemplateTags()) - listView1.Items.Add(new System.Windows.Forms.ListViewItem(new[] { $"<{tag.TagName}>", tag.Description })); + listView1.Items.Add(new ListViewItem(new[] { $"<{tag.TagName}>", tag.Description })); } private void resetToDefaultBtn_Click(object sender, EventArgs e) => resetTextBox(template.DefaultTemplate); @@ -201,13 +200,13 @@ namespace LibationWinForms.Dialogs private void listView1_DoubleClick(object sender, EventArgs e) { - var item = listView1.SelectedItems[0]; + var itemText = listView1.SelectedItems[0].Text.Replace("...", ""); var text = templateTb.Text; var selStart = Math.Min(Math.Max(0, templateTb.SelectionStart), text.Length); - templateTb.Text = text.Insert(selStart, item.Text); - templateTb.SelectionStart = selStart + item.Text.Length; + templateTb.Text = text.Insert(selStart, itemText); + templateTb.SelectionStart = selStart + itemText.Length; } } }