OSDN Git Service

行番号が表示されないバグを修正した
authorkonekoneko <test2214@hotmail.co.jp>
Mon, 25 Aug 2014 15:24:36 +0000 (00:24 +0900)
committerkonekoneko <test2214@hotmail.co.jp>
Mon, 25 Aug 2014 15:24:36 +0000 (00:24 +0900)
Metro/FooEditEngine/Direct2D/D2DRender.cs
Metro/FooEditEngine/FooTextBox.cs

index 6c9be3a..f8003b6 100644 (file)
@@ -64,6 +64,7 @@ namespace FooEditEngine
             this.OverwriteCaret = D2DRenderBase.ToColor4(textbox.OverwriteCaret);
             this.LineMarker = D2DRenderBase.ToColor4(textbox.LineMarker);
             this.UpdateArea = D2DRenderBase.ToColor4(textbox.UpdateArea);
+            this.LineNumber = D2DRenderBase.ToColor4(textbox.LineNumber);
         }
 
         void D2DRender_PreDrawOneLine(MyTextLayout layout,LineToIndexTable lti, int row, double x, double y)
index 4c0f14e..79ca99b 100644 (file)
@@ -1093,8 +1093,6 @@ namespace FooEditEngine.Metro
         public static void OnPropertyChanged(object sender, DependencyPropertyChangedEventArgs e)\r
         {\r
             FooTextBox source = (FooTextBox)sender;\r
-            if (e.Property.Equals(LineNumberProperty))\r
-                source.Render.LineNumber = D2DRenderBase.ToColor4(source.LineNumber);\r
             if (e.Property.Equals(IndentModeProperty))\r
                 source.Controller.IndentMode = source.IndentMode;\r
             if (e.Property.Equals(SelectionProperty) && !source.nowCaretMove)\r
@@ -1168,6 +1166,8 @@ namespace FooEditEngine.Metro
                 source.View.LineBreakCharCount = source.LineBreakCharCount;\r
             if (e.Property.Equals(UpdateAreaProperty))\r
                 source.Render.UpdateArea = D2DRenderBase.ToColor4(source.UpdateArea);\r
+            if (e.Property.Equals(LineNumberProperty))\r
+                source.Render.LineNumber = D2DRenderBase.ToColor4(source.LineNumber);\r
             if (e.Property.Equals(FlowDirectionProperty))\r
             {\r
                 source.Render.RightToLeft = source.FlowDirection == Windows.UI.Xaml.FlowDirection.RightToLeft;\r