スペースでもインデントできるようにした

diff --git a/Common/Controller.cs b/Common/Controller.cs
index ad4a451..71f3b09 100644 (file)
--- a/Common/Controller.cs
+++ b/Common/Controller.cs
@@ -32,6 +32,16 @@ namespace FooEditEngine
         Left,\r
         Right,\r
     }\r
+\r
+    /// <summary>\r
+    /// インデントの方法を表す\r
+    /// </summary>\r
+    public enum IndentMode\r
+    {\r
+        Tab,\r
+        Space,\r
+    }\r
+\r
     /// <summary>\r
     /// ユーザー側からの処理を担当するクラス。一部を除き、こちらで行われた操作はアンドゥの対象になります\r
     /// </summary>\r
@@ -69,6 +79,15 @@ namespace FooEditEngine
         }\r
 \r
         /// <summary>\r
+        /// インデントの方法を表す\r
+        /// </summary>\r
+        public IndentMode IndentMode\r
+        {\r
+            get;\r
+            set;\r
+        }\r
+\r
+        /// <summary>\r
         /// 選択範囲の開始位置\r
         /// </summary>\r
         /// <remarks>SelectionLengthが0の場合、キャレット位置を表します</remarks>\r
@@ -655,6 +674,12 @@ namespace FooEditEngine
             this.DoInputString(ch.ToString());\r
         }\r
 \r
+        string GetIndentSpace(int col_index)\r
+        {\r
+            int space_count = this.View.TabStops - (col_index % this.View.TabStops);\r
+            return new string(Enumerable.Repeat(' ',space_count).ToArray());\r
+        }\r
+\r
         /// <summary>\r
         /// キャレット位置に文字列を挿入し、その分だけキャレットを進める。isInsertModeの値により動作が変わります\r
         /// </summary>\r
@@ -662,6 +687,11 @@ namespace FooEditEngine
         /// <param name="fromTip"></param>\r
         public void DoInputString(string str,bool fromTip = false)\r
         {\r
+            TextPoint CaretPos = this.View.CaretPostion;\r
+\r
+            if (str == "\t" && this.IndentMode == IndentMode.Space)\r
+                str = this.GetIndentSpace(CaretPos.col);\r
+\r
             if (this.View.InsertPoint != null)\r
             {\r
                 this.ReplaceBeforeSelectionArea(this.View.Selections, 0, str);\r
@@ -678,7 +708,6 @@ namespace FooEditEngine
 \r
             int index = this.View.GetIndexFromLayoutLine(this.View.CaretPostion);\r
             int length = 0;\r
-            TextPoint CaretPos = this.View.CaretPostion;\r
             if (this.View.InsertMode == false && index < this.Document.Length && this.Document[index] != Document.NewLine)\r
             {\r
                 string lineString = this.View.LayoutLines[CaretPos.row];\r
@@ -799,7 +828,8 @@ namespace FooEditEngine
             if (this.RectSelection || this.SelectionLength == 0)\r
                 return;\r
             int selectionStart = this.SelectionStart;\r
-            string text = this.InsertLineHead(GetTextFromLineSelectArea(this.View.Selections), "\t");\r
+            string insertStr = this.IndentMode == IndentMode.Space ? this.GetIndentSpace(0) : "\t";\r
+            string text = this.InsertLineHead(GetTextFromLineSelectArea(this.View.Selections), insertStr);\r
             this.RepleaceSelectionArea(this.View.Selections,text);\r
             this.Select(selectionStart, text.Length);\r
         }\r
@@ -812,7 +842,8 @@ namespace FooEditEngine
             if (this.RectSelection || this.SelectionLength == 0)\r
                 return;\r
             int selectionStart = this.SelectionStart;\r
-            string text = this.RemoveLineHead(GetTextFromLineSelectArea(this.View.Selections), "\t");\r
+            string insertStr = this.IndentMode == IndentMode.Space ? this.GetIndentSpace(0) : "\t";\r
+            string text = this.RemoveLineHead(GetTextFromLineSelectArea(this.View.Selections), insertStr);\r
             this.RepleaceSelectionArea(this.View.Selections, text);\r
             this.Select(selectionStart, text.Length);\r
         }\r

diff --git a/Metro/FooEditEngine/FooTextBox.cs b/Metro/FooEditEngine/FooTextBox.cs
index d919e7f..613c44b 100644 (file)
--- a/Metro/FooEditEngine/FooTextBox.cs
+++ b/Metro/FooEditEngine/FooTextBox.cs
@@ -1093,6 +1093,8 @@ namespace FooEditEngine.Metro
         public static void OnPropertyChanged(object sender, DependencyPropertyChangedEventArgs e)\r
         {\r
             FooTextBox source = (FooTextBox)sender;\r
+            if (e.Property.Equals(IndentModeProperty))\r
+                source.Controller.IndentMode = source.IndentMode;\r
             if (e.Property.Equals(SelectionProperty) && !source.nowCaretMove)\r
                 source._Controller.Select(source.Selection.Index,source.Selection.Length);\r
             if (e.Property.Equals(CaretPostionPropertyKey) && !source.nowCaretMove)\r
@@ -1290,6 +1292,21 @@ namespace FooEditEngine.Metro
         }\r
 \r
         /// <summary>\r
+        /// インデントの方法を表す\r
+        /// </summary>\r
+        public IndentMode IndentMode\r
+        {\r
+            get { return (IndentMode)GetValue(IndentModeProperty); }\r
+            set { SetValue(IndentModeProperty, value); }\r
+        }\r
+\r
+        /// <summary>\r
+        /// IndentModeの依存プロパティを表す\r
+        /// </summary>\r
+        public static readonly DependencyProperty IndentModeProperty =\r
+            DependencyProperty.Register("IndentMode", typeof(IndentMode), typeof(FooTextBox), new PropertyMetadata(IndentMode.Tab,OnPropertyChanged));\r
+\r
+        /// <summary>\r
         /// 選択範囲を表す\r
         /// </summary>\r
         /// <remarks>\r

diff --git a/WPF/FooEditEngine/FooTextBox.cs b/WPF/FooEditEngine/FooTextBox.cs
index fd937f1..e7eca43 100644 (file)
--- a/WPF/FooEditEngine/FooTextBox.cs
+++ b/WPF/FooEditEngine/FooTextBox.cs
@@ -1094,6 +1094,9 @@ namespace FooEditEngine.WPF
         {\r
             switch (e.Property.Name)\r
             {\r
+                case "IndentMode":\r
+                    this._Controller.IndentMode = this.IndentMode;\r
+                    break;\r
                 case "Selection":\r
                     if(!this.nowCaretMove)\r
                         this.Select(this.Selection.Index, this.Selection.Length);\r
@@ -1311,6 +1314,21 @@ namespace FooEditEngine.WPF
         }\r
 \r
         /// <summary>\r
+        /// インデントの方法を表す\r
+        /// </summary>\r
+        public IndentMode IndentMode\r
+        {\r
+            get { return (IndentMode)GetValue(IndentModeProperty); }\r
+            set { SetValue(IndentModeProperty, value); }\r
+        }\r
+\r
+        /// <summary>\r
+        /// IndentModeの依存プロパティを表す\r
+        /// </summary>\r
+        public static readonly DependencyProperty IndentModeProperty =\r
+            DependencyProperty.Register("IndentMode", typeof(IndentMode), typeof(FooTextBox), new PropertyMetadata(IndentMode.Tab));\r
+\r
+        /// <summary>\r
         /// 選択範囲を表す\r
         /// </summary>\r
         /// <remarks>\r

diff --git a/WPF/Test/MainWindow.xaml b/WPF/Test/MainWindow.xaml
index 35d717f..476d01a 100644 (file)
--- a/WPF/Test/MainWindow.xaml
+++ b/WPF/Test/MainWindow.xaml
@@ -30,6 +30,7 @@
                 <MenuItem Header="URL Mark" Name="URLMark" Click="URLMark_Click" IsCheckable="True"/>
                 <MenuItem Header="GenerateFolding" Click="MenuItem_Click_9"/>
                 <MenuItem Header="Set Padding" Click="MenuItem_Click_11"/>
+                <MenuItem Header="Indent As Space" Click="MenuItem_Click_13" IsCheckable="True" Name="SpaceIndent"/>
             </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 cd61df2..7365ce1 100644 (file)
--- a/WPF/Test/MainWindow.xaml.cs
+++ b/WPF/Test/MainWindow.xaml.cs
@@ -293,6 +293,20 @@ namespace Test
             this.fooTextBox.PerfomLayouts();
             this.fooTextBox.Refresh();
         }
+
+        private void MenuItem_Click_13(object sender, RoutedEventArgs e)
+        {
+            if(this.fooTextBox.IndentMode == IndentMode.Space)
+            {
+                this.SpaceIndent.IsChecked = false;
+                this.fooTextBox.IndentMode = IndentMode.Tab;
+            }
+            else
+            {
+                this.SpaceIndent.IsChecked = true;
+                this.fooTextBox.IndentMode = IndentMode.Space;
+            }
+        }
     }
     public class TextRangeConveter : System.Windows.Data.IValueConverter
     {

diff --git a/Windows/FooEditEngine/FooTextBox.cs b/Windows/FooEditEngine/FooTextBox.cs
index a1035df..5afecd8 100644 (file)
--- a/Windows/FooEditEngine/FooTextBox.cs
+++ b/Windows/FooEditEngine/FooTextBox.cs
@@ -119,6 +119,22 @@ namespace FooEditEngine.Windows
         public event InsertModeChangeEventHandler InsetModeChange;\r
 \r
         /// <summary>\r
+        /// インデントモードを表す\r
+        /// </summary>\r
+        [DefaultValue(IndentMode.Tab)]\r
+        public IndentMode IndentMode\r
+        {\r
+            get\r
+            {\r
+                return this.Controller.IndentMode;\r
+            }\r
+            set\r
+            {\r
+                this.Controller.IndentMode = value;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
         /// テキスト描写に使用するアンチエイリアシングモードを表す\r
         /// </summary>\r
         [BrowsableAttribute(false)]\r