メトロ版で予測候補の位置がずれることがあった

diff --git a/Core/TextServiceFramework/TextStoreHelper.cs b/Core/TextServiceFramework/TextStoreHelper.cs
index 10be1d2..13cabf5 100644 (file)
--- a/Core/TextServiceFramework/TextStoreHelper.cs
+++ b/Core/TextServiceFramework/TextStoreHelper.cs
@@ -58,7 +58,7 @@ namespace FooEditEngine
             endTextPoint = view.GetLayoutLineFromIndex(endIndex);
             endPos = view.GetPostionFromTextPoint(endTextPoint);
             //変換候補リストに隙間があるので、ユーザーが見えるように少し移動させる
-            endPos.Y += view.LayoutLines.GetLayout(endTextPoint.row).Height + 15;
+            endPos.Y += view.LayoutLines.GetLayout(endTextPoint.row).Height;
         }
 
         public static void GetSelection(Controller controller, SelectCollection selectons, out DotNetTextStore.TextSelection[] sels)

diff --git a/Metro/FooEditEngine/FooTextBox.cs b/Metro/FooEditEngine/FooTextBox.cs
index 8e10ca6..8d422ab 100644 (file)
--- a/Metro/FooEditEngine/FooTextBox.cs
+++ b/Metro/FooEditEngine/FooTextBox.cs
@@ -708,13 +708,13 @@ namespace FooEditEngine.Metro
             float dpi;
             this.Render.GetDpi(out dpi, out dpi);
             double scale = dpi / 96.0;
-
+            
             var gt = this.TransformToVisual(Window.Current.Content);
-            startPos = gt.TransformPoint(startPos.Scale(scale));
-            endPos = gt.TransformPoint(endPos.Scale(scale));
-
-            o_topLeft = new POINT((int)startPos.X, (int)startPos.Y);
-            o_bottomRight = new POINT((int)endPos.X, (int)endPos.Y);
+            var screenStartPos = gt.TransformPoint(startPos.Scale(scale));
+            var screenEndPos = gt.TransformPoint(endPos.Scale(scale));
+            Rect win_rect = Window.Current.CoreWindow.Bounds;
+            o_topLeft = new POINT((int)(screenStartPos.X + win_rect.X), (int)(screenStartPos.Y + win_rect.Y));
+            o_bottomRight = new POINT((int)(screenEndPos.X + win_rect.X), (int)(screenEndPos.Y + win_rect.Y));
         }
 
         void _textStore_GetScreenExtent(out POINT o_topLeft, out POINT o_bottomRight)