OSDN Git Service

UWP版でホイールによる拡大がうまくいかないので一番最初に処理するようにした
authorkonekoneko <test2214@hotmail.co.jp>
Mon, 14 Nov 2016 18:08:39 +0000 (23:38 +0530)
committerkonekoneko <test2214@hotmail.co.jp>
Mon, 14 Nov 2016 18:08:39 +0000 (23:38 +0530)
UWP/FooEditEngine.UWP/FooTextBox.cs

index be4b14d..798875c 100644 (file)
@@ -963,16 +963,6 @@ namespace FooEditEngine.UWP
 
         void gestureRecongnizer_ManipulationUpdated(GestureRecognizer sender, ManipulationUpdatedEventArgs e)
         {
-            if (this._Controller.MoveCaretAndGripper(e.Position, this.hittedGripper))
-            {
-#if ENABLE_AUTMATION
-                if (this.peer != null)
-                    this.peer.OnNotifyCaretChanged();
-#endif
-                this.Refresh();                
-                return;
-            }
-
             if (e.Delta.Scale < 1)
             {
                 double newSize = this.Render.FontSize - 1;
@@ -983,7 +973,7 @@ namespace FooEditEngine.UWP
                 SetValue(MagnificationPowerPropertyKey, this.Render.FontSize / this.FontSize);
                 return;
             }
-            
+
             if (e.Delta.Scale > 1)
             {
                 double newSize = this.Render.FontSize + 1;
@@ -994,6 +984,16 @@ namespace FooEditEngine.UWP
                 SetValue(MagnificationPowerPropertyKey, this.Render.FontSize / this.FontSize);
                 return;
             }
+
+            if (this._Controller.MoveCaretAndGripper(e.Position, this.hittedGripper))
+            {
+#if ENABLE_AUTMATION
+                if (this.peer != null)
+                    this.peer.OnNotifyCaretChanged();
+#endif
+                this.Refresh();                
+                return;
+            }
             
             Point translation = e.Delta.Translation;