[Feature] Rearrange the code

Author: IIzzaya

Runtime/editor/editor_mouse_tracking.cs

@@ -9,6 +9,10 @@ public partial class MouseTracker {
         bool _enableDragFromEditorRelease = false;
 
         void _handleDragFromEditorEvent(PointerEvent evt, int deviceId) {
+            if (!this.inEditorWindow) {
+                return;
+            }
+
             if (evt is PointerDragFromEditorReleaseEvent) {
                 this._enableDragFromEditorRelease = false;
                 this._scheduleDragFromEditorReleaseCheck();
@@ -26,6 +30,17 @@ evt is PointerDragFromEditorHoverEvent ||
             }
         }
 
+        void detachDragFromEditorAnnotation(MouseTrackerAnnotation annotation, int deviceId) {
+            if (!this.inEditorWindow) {
+                return;
+            }
+
+            if (annotation.onDragFromEditorExit != null) {
+                annotation.onDragFromEditorExit(
+                    PointerDragFromEditorExitEvent.fromDragFromEditorEvent(this._lastMouseEvent[deviceId]));
+            }
+        }
+
         void _scheduleDragFromEditorReleaseCheck() {
             DragAndDrop.AcceptDrag();
 
@@ -85,6 +100,10 @@ void _enableDragFromEditorReleaseVisualModeLoop() {
         }
 
         void _scheduleDragFromEditorMousePositionCheck() {
+            if (!this.inEditorWindow) {
+                return;
+            }
+
             SchedulerBinding.instance.addPostFrameCallback(_ => { this.collectDragFromEditorMousePositions(); });
             SchedulerBinding.instance.scheduleFrame();
         }

Runtime/editor/editor_window.cs

@@ -126,8 +126,8 @@ public interface WindowHost {
     public abstract class WindowAdapter : Window {
         static readonly List<WindowAdapter> _windowAdapters = new List<WindowAdapter>();
 
-        public WindowAdapter(bool inEditor = false) {
-            this.inEditor = inEditor;
+        public WindowAdapter(bool inEditorWindow = false) {
+            this.inEditorWindow = inEditorWindow;
         }
 
         public static List<WindowAdapter> windowAdapters {
@@ -218,14 +218,14 @@ public void OnDisable() {
             this._surface = null;
         }
 
-        readonly protected bool inEditor;
+        readonly protected bool inEditorWindow;
 
         public override IDisposable getScope() {
             WindowAdapter oldInstance = (WindowAdapter) _instance;
             _instance = this;
 
             if (this._binding == null) {
-                this._binding = new WidgetsBinding(this.inEditor);
+                this._binding = new WidgetsBinding(this.inEditorWindow);
             }
 
             SchedulerBinding._instance = this._binding;

Runtime/gestures/mouse_tracking.cs

@@ -75,14 +75,14 @@ public partial class MouseTracker {
         public MouseTracker(
             PointerRouter router,
             MouseDetectorAnnotationFinder annotationFinder,
-            bool inEditor = false
+            bool inEditorWindow = false
         ) {
             router.addGlobalRoute(this._handleEvent);
             this.annotationFinder = annotationFinder;
-            this.inEditor = inEditor;
+            this.inEditorWindow = inEditorWindow;
         }
 
-        readonly bool inEditor;
+        readonly bool inEditorWindow;
 
         readonly Dictionary<int, PointerEvent> _lastMouseEvent = new Dictionary<int, PointerEvent>();
 
@@ -100,9 +100,7 @@ public void attachAnnotation(MouseTrackerAnnotation annotation) {
             this._scheduleMousePositionCheck();
 
 #if UNITY_EDITOR
-            if (this.inEditor) {
-                this._scheduleDragFromEditorMousePositionCheck();
-            }
+            this._scheduleDragFromEditorMousePositionCheck();
 #endif
         }
 
@@ -114,11 +112,8 @@ public void detachAnnotation(MouseTrackerAnnotation annotation) {
                         PointerExitEvent.fromHoverEvent((PointerHoverEvent) this._lastMouseEvent[deviceId]));
                 }
 #if UNITY_EDITOR
-                if (this.inEditor && annotation.onDragFromEditorExit != null) {
-                    annotation.onDragFromEditorExit(
-                        PointerDragFromEditorExitEvent.fromDragFromEditorEvent(this._lastMouseEvent[deviceId]));
+                this.detachDragFromEditorAnnotation(annotation, deviceId);
 #endif
-                }
             }
 
             this._trackedAnnotations.Remove(annotation);
@@ -162,9 +157,7 @@ evt is PointerHoverEvent ||
             }
 
 #if UNITY_EDITOR
-            if (this.inEditor) {
-                this._handleDragFromEditorEvent(evt, deviceId);
-            }
+            this._handleDragFromEditorEvent(evt, deviceId);
 #endif
         }
 
@@ -232,6 +225,7 @@ void exitAllDevices(_TrackedAnnotation trackedAnnotation) {
                 }
 
                 _TrackedAnnotation hitAnnotation = this._findAnnotation(hit);
+
                 //enter
                 if (!hitAnnotation.activeDevices.Contains(deviceId)) {
                     hitAnnotation.activeDevices.Add(deviceId);

Runtime/rendering/binding.cs

@@ -11,7 +11,7 @@ public class RendererBinding : PaintingBinding {
             set { PaintingBinding.instance = value; }
         }
 
-        public RendererBinding(bool inEditor = false) {
+        public RendererBinding(bool inEditorWindow = false) {
             this._pipelineOwner = new PipelineOwner(
                 onNeedVisualUpdate: this.ensureVisualUpdate
             );
@@ -22,7 +22,7 @@ public RendererBinding(bool inEditor = false) {
             D.assert(this.renderView != null);
             this.addPersistentFrameCallback(this._handlePersistentFrameCallback);
 
-            this.inEditor = inEditor;
+            this.inEditorWindow = inEditorWindow;
             this._mouseTracker = this._createMouseTracker();
         }
 
@@ -72,14 +72,14 @@ void _handlePersistentFrameCallback(TimeSpan timeStamp) {
             this.drawFrame();
         }
 
-        readonly protected bool inEditor;
+        readonly protected bool inEditorWindow;
 
         MouseTracker _createMouseTracker() {
             return new MouseTracker(this.pointerRouter, (Offset offset) => {
                 return this.renderView.layer.find<MouseTrackerAnnotation>(
                     offset
                 );
-            }, this.inEditor);
+            }, this.inEditorWindow);
         }
 
         protected virtual void drawFrame() {

Runtime/widgets/binding.cs

@@ -27,7 +27,7 @@ public class WidgetsBinding : RendererBinding {
             set { RendererBinding.instance = value; }
         }
 
-        public WidgetsBinding(bool inEditor = false) : base(inEditor) {
+        public WidgetsBinding(bool inEditorWindow = false) : base(inEditorWindow) {
             this.buildOwner.onBuildScheduled = this._handleBuildScheduled;
             Window.instance.onLocaleChanged += this.handleLocaleChanged;
             this.widgetInspectorService = new WidgetInspectorService(this);