読み込みやスクロールの無駄な動作を省いた

diff --git a/Core/Util.cs b/Core/Util.cs
index 00432ea..5a18f6c 100644 (file)
--- a/Core/Util.cs
+++ b/Core/Util.cs
@@ -21,10 +21,13 @@ namespace FooEditEngine
     class Util
     {
 #if METRO || WINDOWS_UWP
+        static float? _LogicalDpi;
         public static void GetDpi(out float dpix, out float dpiy)
         {
-            dpix = Windows.Graphics.Display.DisplayInformation.GetForCurrentView().LogicalDpi;
-            dpiy = Windows.Graphics.Display.DisplayInformation.GetForCurrentView().LogicalDpi;
+            if(_LogicalDpi == null)
+                _LogicalDpi = Windows.Graphics.Display.DisplayInformation.GetForCurrentView().LogicalDpi;
+            dpix = _LogicalDpi.Value;
+            dpiy = _LogicalDpi.Value;
         }
 
         public static double GetScale()

diff --git a/UWP/FooEditEngine.UWP/FooTextBox.cs b/UWP/FooEditEngine.UWP/FooTextBox.cs
index ae36510..5ce14e5 100644 (file)
--- a/UWP/FooEditEngine.UWP/FooTextBox.cs
+++ b/UWP/FooEditEngine.UWP/FooTextBox.cs
@@ -849,7 +849,7 @@ namespace FooEditEngine.UWP
             int i_startIndex = args.Request.Range.StartCaretPosition;
             int i_endIndex = args.Request.Range.EndCaretPosition;
 
-            if(args.Request.IsCanceled)
+            if(args.Request.IsCanceled || i_startIndex == i_endIndex)
             {
                 return;
             }

diff --git a/UWP/Test/MainViewModel.cs b/UWP/Test/MainViewModel.cs
index 63122c7..774e468 100644 (file)
--- a/UWP/Test/MainViewModel.cs
+++ b/UWP/Test/MainViewModel.cs
@@ -89,7 +89,8 @@ namespace Test
                 using (var ws = await file.OpenAsync(FileAccessMode.Read))
                 using (var fs = new StreamReader(ws.AsStream()))
                 {
-                    await doc.LoadAsync(fs, null);
+                    var prop = await file.GetBasicPropertiesAsync();
+                    await doc.LoadAsync(fs, null,(int)prop.Size);
                 }
                 doc.RequestRedraw();
                 _list.Add(doc);