レンダーターゲットが変わった時に再作成し忘れていたやつがあった

[fooeditengine/FooEditEngine.git] / Core / Direct2D / MultiSet.cs

diff --git a/Core/Direct2D/MultiSet.cs b/Core/Direct2D/MultiSet.cs
index 97d67e2..9b13bb8 100644 (file)
--- a/Core/Direct2D/MultiSet.cs
+++ b/Core/Direct2D/MultiSet.cs
@@ -33,7 +33,6 @@ namespace FooEditEngine
             this._Format = format;
             this._Fore = fore;
             this.Brushes = brushes;
-            this.Brushes.RenderChanged += Brushes_RenderChanged;
         }
 
         public bool ContainsSymbol(char c)
@@ -47,11 +46,10 @@ namespace FooEditEngine
         {
             if (c == '\t')
             {
-                this.InlineTabs = new MultiSet<double,InlineTab>();
+                this.InlineTabs = new MultiSet<double, InlineTab>();
             }
             else
             {
-                D2D.SolidColorBrush brush = this.Brushes.Get(this.Fore);
                 for (int i = 0; i < DuplicateCount; i++)
                 {
                     this.InlineChars.Add(c, new InlineChar(this.Factory, this.Format, this.Brushes, this.Fore, alt));
@@ -104,13 +102,13 @@ namespace FooEditEngine
             }
             set
             {
-                this._TabWidth = value; 
-                if(this.InlineTabs != null)
+                this._TabWidth = value;
+                if (this.InlineTabs != null)
                     this.InlineTabs.Clear();
             }
         }
 
-        public DW.InlineObject Get(MyTextLayout layout,int index, string str)
+        public DW.InlineObject Get(MyTextLayout layout, int index, string str)
         {
             if (str[index] == '\t')
             {
@@ -128,9 +126,8 @@ namespace FooEditEngine
                 if (!this.InlineTabs.TryGet(width, out collection))
                 {
                     collection = new List<InlineTab>();
-                    D2D.SolidColorBrush brush = this.Brushes.Get(this.Fore);
                     for (int i = 0; i < DuplicateCount; i++)
-                        collection.Add(new InlineTab(this.Brushes, this.Fore, width,layout.Height));
+                        collection.Add(new InlineTab(this.Brushes, this.Fore, width, layout.Height));
                     this.InlineTabs.Add(width, collection);
                 }
                 return collection[index % DuplicateCount];
@@ -146,13 +143,13 @@ namespace FooEditEngine
 
         public void Clear()
         {
-            if(this.InlineChars != null)
+            if (this.InlineChars != null)
                 this.InlineChars.Clear();
-            if(this.InlineTabs != null)
+            if (this.InlineTabs != null)
                 this.InlineTabs.Clear();
         }
 
-        void ReGenerate()
+        public void ReGenerate()
         {
             List<KeyValuePair<char, char>> list = new List<KeyValuePair<char, char>>(this.InlineChars.Count);
             foreach (KeyValuePair<char, InlineChar> kv in this.InlineChars.EnumrateKeyAndFirstValue())
@@ -165,16 +162,11 @@ namespace FooEditEngine
 
             this.InlineTabs.Clear();
 
-            D2D.SolidColorBrush brush = this.Brushes.Get(this.Fore);
             foreach (KeyValuePair<char, char> kv in list)
                 for (int i = 0; i < DuplicateCount; i++)
                     this.InlineChars.Add(kv.Key, new InlineChar(this.Factory, this.Format, this.Brushes, this.Fore, kv.Value));
         }
 
-        void Brushes_RenderChanged(object sender, EventArgs e)
-        {
-            this.ReGenerate();
-        }
     }
     sealed class MultiSet<T, J>
         where J : IDisposable
@@ -212,7 +204,7 @@ namespace FooEditEngine
             return this.Collection.TryGetValue(key, out value);
         }
 
-        public J Get(T key,int index)
+        public J Get(T key, int index)
         {
             return this.Collection[key][index];
         }