InsertAtSelectionHandlerでo_startIndexとo_endIndexを指定できるようにした

diff --git a/Common/DotNetTextStore/TextStoreBase.cs b/Common/DotNetTextStore/TextStoreBase.cs
index 951ff3a..90e8c6d 100644 (file)
--- a/Common/DotNetTextStore/TextStoreBase.cs
+++ b/Common/DotNetTextStore/TextStoreBase.cs
@@ -115,7 +115,7 @@ namespace DotNetTextStore
         public delegate string GetStringHandler(int start, int length);\r
         public event GetStringHandler GetString;\r
 \r
-        public delegate void InsertAtSelectionHandler(string i_value);\r
+        public delegate void InsertAtSelectionHandler(string i_value,ref int o_startIndex,ref int o_endIndex);\r
         public event InsertAtSelectionHandler InsertAtSelection;\r
 \r
         public delegate void GetScreenExtentHandler(\r
@@ -1140,15 +1140,14 @@ namespace DotNetTextStore
                     DebugOut.Print("start: {0}, end: {1}, text: {2}", start, end, new string(i_text));\r
 #endif\r
 \r
-                    InsertAtSelection(new string(i_text));\r
-\r
                     o_startIndex = start;\r
                     o_endIndex = start + i_length;\r
 \r
+                    InsertAtSelection(new string(i_text), ref o_startIndex, ref o_endIndex);\r
+\r
                     o_textChange.start = start;\r
                     o_textChange.oldEnd = end;\r
-                    o_textChange.newEnd = start + i_length;\r
-\r
+                    o_textChange.newEnd = o_endIndex;\r
                     // InsertAtSelection() 内でカーソル位置を更新しているため、ここでは不要。\r
                     // 改行した時に位置が狂う。\r
                     // SetSelectionIndex(start, start + i_length);\r

diff --git a/Metro/FooEditEngine/FooTextBox.cs b/Metro/FooEditEngine/FooTextBox.cs
index 1445fea..d919e7f 100644 (file)
--- a/Metro/FooEditEngine/FooTextBox.cs
+++ b/Metro/FooEditEngine/FooTextBox.cs
@@ -749,7 +749,7 @@ namespace FooEditEngine.Metro
             this.Refresh();\r
         }\r
 \r
-        void _textStore_InsertAtSelection(string i_value)\r
+        void _textStore_InsertAtSelection(string i_value,ref int o_stratIndex,ref int o_endIndex)\r
         {\r
             TextStoreHelper.InsertTextAtSelection(this._Controller, i_value);\r
             this.Refresh();\r

diff --git a/WPF/FooEditEngine/FooTextBox.cs b/WPF/FooEditEngine/FooTextBox.cs
index 25e71c6..fd937f1 100644 (file)
--- a/WPF/FooEditEngine/FooTextBox.cs
+++ b/WPF/FooEditEngine/FooTextBox.cs
@@ -635,7 +635,7 @@ namespace FooEditEngine.WPF
             this.Refresh();\r
         }\r
 \r
-        void _textStore_InsertAtSelection(string i_value)\r
+        void _textStore_InsertAtSelection(string i_value, ref int o_startIndex, ref int o_endIndex)\r
         {\r
             TextStoreHelper.InsertTextAtSelection(this._Controller, i_value);\r
             this.Refresh();\r