インデントの方式がスペースの時に正しく逆インデントできなかった

diff --git a/Core/Controller.cs b/Core/Controller.cs
index be742ef..fb5f39f 100644 (file)
--- a/Core/Controller.cs
+++ b/Core/Controller.cs
@@ -880,7 +880,7 @@ namespace FooEditEngine
                 return;
             int selectionStart = this.SelectionStart;
             string insertStr = this.IndentMode == IndentMode.Space ? this.GetIndentSpace(0) : "\t";
-            string text = this.RemoveLineHead(GetTextFromLineSelectArea(this.View.Selections), insertStr);
+            string text = this.RemoveLineHead(GetTextFromLineSelectArea(this.View.Selections), insertStr, insertStr.Length);
             this.RepleaceSelectionArea(this.View.Selections, text);
             this.Document.Select(selectionStart, text.Length);
         }
@@ -899,14 +899,14 @@ namespace FooEditEngine
             return output.ToString();
         }
 
-        public string RemoveLineHead(string s, string str)
+        public string RemoveLineHead(string s, string str,int remove_count)
         {
             string[] lines = s.Split(new string[] { Document.NewLine.ToString() }, StringSplitOptions.None);
             StringBuilder output = new StringBuilder();
             for (int i = 0; i < lines.Length; i++)
             {
                 if (lines[i].StartsWith(str))
-                    output.Append(lines[i].Substring(1) + Document.NewLine);
+                    output.Append(lines[i].Substring(remove_count) + Document.NewLine);
                 else if (i < lines.Length - 1)
                     output.Append(lines[i] + Document.NewLine);
             }

diff --git a/WPF/Test/MainWindow.xaml b/WPF/Test/MainWindow.xaml
index 07b7656..2e90c45 100644 (file)
--- a/WPF/Test/MainWindow.xaml
+++ b/WPF/Test/MainWindow.xaml
@@ -33,7 +33,7 @@
                 <MenuItem Header="URL Mark" IsChecked="{Binding MarkURL,ElementName=fooTextBox,Mode=TwoWay}" IsCheckable="True"/>
                 <MenuItem Header="GenerateFolding" Click="MenuItem_Click_9"/>
                 <MenuItem Header="Set Padding" Click="MenuItem_Click_11"/>
-                <MenuItem Header="Indent As Space" IsChecked="{Binding IsSpaceIndent,Mode=TwoWay}" IsCheckable="True"/>
+                <MenuItem Header="Toggle Indent Mode" Click="MenuItem_Click12"/>
             </MenuItem>
         </Menu>
         <MyNamespace:FooTextBox x:Name="fooTextBox" Grid.Row="1"/>

diff --git a/WPF/Test/MainWindow.xaml.cs b/WPF/Test/MainWindow.xaml.cs
index c8d548e..468242b 100644 (file)
--- a/WPF/Test/MainWindow.xaml.cs
+++ b/WPF/Test/MainWindow.xaml.cs
@@ -255,6 +255,19 @@ namespace Test
                 this.fooTextBox.Refresh();
             }
         }
+
+        private void MenuItem_Click12(object sender, RoutedEventArgs e)
+        {
+            if (this.fooTextBox.IndentMode == IndentMode.Space)
+            {
+                this.fooTextBox.IndentMode = IndentMode.Tab;
+            }
+            else
+            {
+                this.fooTextBox.IndentMode = IndentMode.Space;
+            }
+            this.fooTextBox.Refresh();
+        }
     }
     public class FlowDirectionConveter : System.Windows.Data.IValueConverter
     {