From: konekoneko <test2214@hotmail.co.jp>
Date: Sat, 26 Apr 2014 11:09:01 +0000 (+0900)
Subject: 特定状況で折りたたむとフリーズしてしまうバグを修正した
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c0424cbcd74dadea9ed43c211aed9c2cbd6c14f;hp=82de39ad8b81295579ebdbe9fb5cb8028a198e02;p=fooeditengine%2FFooEditEngine.git

特定状況で折りたたむとフリーズしてしまうバグを修正した
---

diff --git a/Common/EditView.cs b/Common/EditView.cs
index 6de6a4c..b059743 100644
--- a/Common/EditView.cs
+++ b/Common/EditView.cs
@@ -783,6 +783,8 @@ namespace FooEditEngine
                     row = this.LayoutLines.GetLineNumberFromIndex(foldingData.End) + 1;
                 else
                     row = this.LayoutLines.GetLineNumberFromIndex(foldingData.Start);
+                if(row > this.LayoutLines.Count - 1)
+                    row = this.LayoutLines.GetLineNumberFromIndex(foldingData.Start);
             }
             return row;
         }
@@ -845,7 +847,7 @@ namespace FooEditEngine
                 int lineHeadIndex = this.LayoutLines.GetIndexFromLineNumber(row);
                 int lineLength = this.LayoutLines.GetLengthFromLineNumber(row);
 
-                if (this.LayoutLines.FoldingCollection.IsHidden(lineHeadIndex))
+                if (this.LayoutLines.FoldingCollection.IsHidden(lineHeadIndex) && row < this.LayoutLines.Count - 1)
                     continue;
 
                 ITextLayout layout = this.LayoutLines.GetLayout(row);
diff --git a/Metro/FooEditEngine/Properties/AssemblyInfo.cs b/Metro/FooEditEngine/Properties/AssemblyInfo.cs
index 8723fc8..19ebc2e 100644
--- a/Metro/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/Metro/FooEditEngine/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、以下のように '*' を使用してビルドおよびリビジョン番号を
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.14.0.0")]
-[assembly: AssemblyFileVersion("1.14.0.0")]
+[assembly: AssemblyVersion("1.15.0.0")]
+[assembly: AssemblyFileVersion("1.15.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/WPF/FooEditEngine/Properties/AssemblyInfo.cs b/WPF/FooEditEngine/Properties/AssemblyInfo.cs
index 72d619c..503dde3 100644
--- a/WPF/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/WPF/FooEditEngine/Properties/AssemblyInfo.cs
@@ -51,8 +51,8 @@ using System.Windows;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.115.0.0")]
-[assembly: AssemblyFileVersion("1.115.0.0")]
+[assembly: AssemblyVersion("1.116.0.0")]
+[assembly: AssemblyFileVersion("1.116.0.0")]
 
 #if DEBUG
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTest")]
diff --git a/Windows/FooEditEngine/Properties/AssemblyInfo.cs b/Windows/FooEditEngine/Properties/AssemblyInfo.cs
index c0a8cb8..7fad0b8 100644
--- a/Windows/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/Windows/FooEditEngine/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.30.0.0")]
-[assembly: AssemblyFileVersion("1.30.0.0")]
+[assembly: AssemblyVersion("1.31.0.0")]
+[assembly: AssemblyFileVersion("1.31.0.0")]