OSDN Git Service

OnRenderChangedメソッドを呼び出すようにした
authortest <test@yahoo.co.jp>
Sun, 23 Aug 2020 09:32:59 +0000 (18:32 +0900)
committertest <test@yahoo.co.jp>
Sun, 23 Aug 2020 09:32:59 +0000 (18:32 +0900)
Core/Direct2D/D2DRenderCommon.cs

index e1b67af..97f3e24 100644 (file)
@@ -51,9 +51,6 @@ namespace FooEditEngine
     sealed class ColorBrushCollection
     {
         ResourceManager<Color4, D2D.SolidColorBrush> cache = new ResourceManager<Color4, D2D.SolidColorBrush>();
-        D2D.RenderTarget _render;
-
-        public event EventHandler RenderChanged;
 
         public D2D.SolidColorBrush Get(D2D.RenderTarget render,Color4 key)
         {
@@ -267,7 +264,13 @@ namespace FooEditEngine
 #endif
             layout.Dispose();
 
-            this.ChangedRenderResource(this,new ChangedRenderRsourceEventArgs(ResourceType.Font));
+            this.OnChangedRenderResource(this,new ChangedRenderRsourceEventArgs(ResourceType.Font));
+        }
+
+        public void OnChangedRenderResource(object sender, ChangedRenderRsourceEventArgs e)
+        {
+            if (this.ChangedRenderResource != null)
+                this.ChangedRenderResource(sender, e);
         }
 
         DW.ReadingDirection GetDWRightDirect(bool rtl)
@@ -301,7 +304,7 @@ namespace FooEditEngine
                     throw new InvalidOperationException();
                 this._TextAntialiasMode = value;
                 this.render.TextAntialiasMode = (D2D.TextAntialiasMode)value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Antialias));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Antialias));
             }
         }
 
@@ -390,7 +393,7 @@ namespace FooEditEngine
                 this._Forground = value;
                 if (this.textRender != null)
                     this.textRender.DefaultFore = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }
 
@@ -447,7 +450,7 @@ namespace FooEditEngine
                 this._ControlChar = value;
                 if (this.HiddenChars != null)
                     this.HiddenChars.Fore = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }
 
@@ -460,7 +463,7 @@ namespace FooEditEngine
             set
             {
                 this._URL = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }
 
@@ -485,7 +488,7 @@ namespace FooEditEngine
             set
             {
                 this._Comment = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }
 
@@ -498,7 +501,7 @@ namespace FooEditEngine
             set
             {
                 this._Literal = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }
 
@@ -511,7 +514,7 @@ namespace FooEditEngine
             set
             {
                 this._Keyword1 = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }
 
@@ -524,7 +527,7 @@ namespace FooEditEngine
             set
             {
                 this._Keyword2 = value;
-                this.ChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
+                this.OnChangedRenderResource(this, new ChangedRenderRsourceEventArgs(ResourceType.Brush));
             }
         }