PrintableViewにLineNumberMarginを設定し忘れた

diff --git a/Common/EditView.cs b/Common/EditView.cs
index c247996..4393b95 100644 (file)
--- a/Common/EditView.cs
+++ b/Common/EditView.cs
@@ -175,14 +175,6 @@ namespace FooEditEngine
             }\r
         }\r
 \r
-        public double LineNumberMargin\r
-        {\r
-            get\r
-            {\r
-                return this.render.emSize.Width;\r
-            }\r
-        }\r
-\r
         /// <summary>\r
         /// 矩形選択モード中に文字列が挿入される位置を表す\r
         /// </summary>\r

diff --git a/Common/PrintableView.cs b/Common/PrintableView.cs
index 436e7b4..1c70528 100644 (file)
--- a/Common/PrintableView.cs
+++ b/Common/PrintableView.cs
@@ -93,8 +93,8 @@ namespace FooEditEngine
                 if (this.render.RightToLeft)\r
                     x = this.Padding.Left;\r
                 else\r
-                    x = this.render.LineNemberWidth + this.render.emSize.Width + this.Padding.Left;\r
-                width = this.PageBound.Width - this.render.LineNemberWidth - this.render.emSize.Width - this.Padding.Right - this.Padding.Left;\r
+                    x = this.render.LineNemberWidth + this.render.emSize.Width + this.Padding.Left + this.LineNumberMargin;\r
+                width = this.PageBound.Width - this.render.LineNemberWidth - this.render.emSize.Width - this.Padding.Right - this.Padding.Left - this.LineNumberMargin;\r
             }\r
             else\r
             {\r
@@ -158,9 +158,9 @@ namespace FooEditEngine
                     if (this.DrawLineNumber == false)\r
                         throw new InvalidOperationException();\r
                     if (this.render.RightToLeft)\r
-                        return this.PageBound.TopRight.X - this.render.LineNemberWidth;\r
+                        return this.PageBound.TopRight.X - this.render.LineNemberWidth - this.LineNumberMargin;\r
                     else\r
-                        return this.render.TextArea.X - this.render.LineNemberWidth - this.render.emSize.Width;\r
+                        return this.render.TextArea.X - this.render.LineNemberWidth - this.render.emSize.Width - this.LineNumberMargin;\r
                 case AreaType.TextArea:\r
                     return this.render.TextArea.X;\r
             }\r

diff --git a/Common/ViewBase.cs b/Common/ViewBase.cs
index 2842906..05ac89e 100644 (file)
--- a/Common/ViewBase.cs
+++ b/Common/ViewBase.cs
@@ -226,6 +226,14 @@ namespace FooEditEngine
             }\r
         }\r
 \r
+        public double LineNumberMargin\r
+        {\r
+            get\r
+            {\r
+                return this.render.emSize.Width;\r
+            }\r
+        }\r
+\r
         /// <summary>\r
         /// シンタックスハイライター\r
         /// </summary>\r