BUG 2999054: Adding code to prefer Unicode format from clipboard before accepting ANSI text.

This commit is contained in:
niel-archer 2011-12-30 02:26:09 +00:00
parent 971a6ee212
commit 40c9a3459c
2 changed files with 18 additions and 11 deletions

View file

@ -899,9 +899,15 @@ namespace LSLEditor
public new void Paste()
{
ResetHighlichting();
ResetHighlighting();
if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true))
// First try with Unicode
if (Clipboard.GetDataObject().GetDataPresent(DataFormats.UnicodeText, true))
{
string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.UnicodeText, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste;
} // failing that try ANSI text.
else if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true))
{
string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste;
@ -1147,7 +1153,7 @@ namespace LSLEditor
protected override void OnKeyPress(KeyPressEventArgs e)
{
ResetHighlichting();
ResetHighlighting();
char keyChar = e.KeyChar;
@ -1743,7 +1749,7 @@ namespace LSLEditor
{
BeginUpdate();
ResetHighlichting();
ResetHighlighting();
string strW = GetNewWhiteSpace(-1);
int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length);
@ -1892,7 +1898,7 @@ namespace LSLEditor
}
}
private void ResetHighlichting()
private void ResetHighlighting()
{
if (HighLightList.Count == 0)
return;