From ccf204f5863e93d18b4b2296f4a50fcab6731d1a Mon Sep 17 00:00:00 2001
From: test <test@yahoo.co.jp>
Date: Mon, 4 Jan 2021 14:46:21 +0900
Subject: [PATCH] =?utf8?q?=E4=BA=92=E6=8F=9B=E6=80=A7=E3=81=AE=E3=81=AA?=
 =?utf8?q?=E3=81=84=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E3=81=84?=
 =?utf8?q?=E3=81=A4=E3=81=8B=E5=BB=83=E6=AD=A2=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Core/ViewBase.cs                      | 22 ----------------------
 WPF/FooEditEngine/FooTextBox.cs       |  9 ---------
 Windows/FooEditEngine/FooPrintText.cs |  2 +-
 Windows/FooEditEngine/FooTextBox.cs   |  2 +-
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/Core/ViewBase.cs b/Core/ViewBase.cs
index 26dda4c..846e60c 100644
--- a/Core/ViewBase.cs
+++ b/Core/ViewBase.cs
@@ -126,8 +126,6 @@ namespace FooEditEngine
         private void _Document_PerformLayouted(object sender, EventArgs e)
         {
             CalculateLineCountOnScreen();
-            if(this.PerformLayouted != null)
-                this.PerformLayouted(this, e);
         }
 
         private void Document_StatusUpdate(object sender, EventArgs e)
@@ -166,9 +164,6 @@ namespace FooEditEngine
 
         public event EventHandler SrcChanged;
 
-        [Obsolete]
-        public event EventHandler PerformLayouted;
-
         public event EventHandler PageBoundChanged;
 
         /// <summary>
@@ -233,16 +228,6 @@ namespace FooEditEngine
         }
 
         /// <summary>
-        /// すべてのレイアウト行を破棄し、再度レイアウトをやり直す
-        /// </summary>
-        [Obsolete]
-        public virtual void PerfomLayouts()
-        {
-            //互換性を保つために残しておく
-            this.Document.PerformLayout();
-        }
-
-        /// <summary>
         /// 余白を表す
         /// </summary>
         public Padding Padding
@@ -435,13 +420,6 @@ namespace FooEditEngine
                 this.SrcChanged(this, e);
         }
 
-        protected virtual void OnPerformLayoutedChanged(EventArgs e)
-        {
-            EventHandler handler = this.PerformLayouted;
-            if (handler != null)
-                this.PerformLayouted(this, e);
-        }
-
         protected virtual void OnPageBoundChanged(EventArgs e)
         {
             EventHandler handler = this.PageBoundChanged;
diff --git a/WPF/FooEditEngine/FooTextBox.cs b/WPF/FooEditEngine/FooTextBox.cs
index b5a1806..feec422 100644
--- a/WPF/FooEditEngine/FooTextBox.cs
+++ b/WPF/FooEditEngine/FooTextBox.cs
@@ -133,8 +133,6 @@ namespace FooEditEngine.WPF
 
             this.Loaded += new RoutedEventHandler(FooTextBox_Loaded);
 
-            this.AutoIndentHooker = (s,e)=>{};
-
             SystemEvents.UserPreferenceChanged += new UserPreferenceChangedEventHandler(SystemEvents_UserPreferenceChanged);
 
             this.SystemEvents_UserPreferenceChanged(null, new UserPreferenceChangedEventArgs(UserPreferenceCategory.Keyboard));
@@ -154,12 +152,6 @@ namespace FooEditEngine.WPF
         }
 
         /// <summary>
-        /// オートインデントを行うためのイベント
-        /// </summary>
-        [Obsolete]
-        public AutoIndentHookerHandler AutoIndentHooker;
-
-        /// <summary>
         /// テンプレートを適用します
         /// </summary>
         public override void OnApplyTemplate()
@@ -689,7 +681,6 @@ namespace FooEditEngine.WPF
             if (e.Text == "\r")
             {
                 this._Controller.DoEnterAction();
-                this.AutoIndentHooker(this, null);
             }
             else if (e.Text == "\b")
             {
diff --git a/Windows/FooEditEngine/FooPrintText.cs b/Windows/FooEditEngine/FooPrintText.cs
index da3a3e7..dd2b13b 100644
--- a/Windows/FooEditEngine/FooPrintText.cs
+++ b/Windows/FooEditEngine/FooPrintText.cs
@@ -196,7 +196,7 @@ namespace FooEditEngine.Windows
                 documentSnap.LineBreakCharCount = this.LineBreakCharCount;
                 documentSnap.DrawLineNumber = this.DrawLineNumber;
                 documentSnap.UrlMark = this.Document.UrlMark;
-                this.view.PerfomLayouts();
+                documentSnap.PerformLayout(false);
             }
 
             if (e.PageSettings.PrinterSettings.PrintRange == PrintRange.SomePages)
diff --git a/Windows/FooEditEngine/FooTextBox.cs b/Windows/FooEditEngine/FooTextBox.cs
index 0b7c134..8f360e7 100644
--- a/Windows/FooEditEngine/FooTextBox.cs
+++ b/Windows/FooEditEngine/FooTextBox.cs
@@ -881,7 +881,7 @@ namespace FooEditEngine.Windows
         /// </summary>
         public void PerfomLayouts()
         {
-            this.View.PerfomLayouts();
+            this.Document.PerformLayout();
             initScrollBars();
         }
 
-- 
2.11.0