Merge branch 'dev'

robertobrambila · May 27, 2020 · d8227f0 · d8227f0
2 parents b9472fa + 00d3d67
commit d8227f0
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Assets/Editor/FS_UnitySceneTools.cs b/Assets/Editor/FS_UnitySceneTools.cs
@@ -81,13 +81,6 @@ private static void ShowWindow() {
 
         void Awake()
         {
-
-            // check to see if we're already docked in the scene, if so enable mousemove to allow for correct window repaint
-            var window = GetWindow<FS_UnitySceneTools>();
-            if (window != null)
-            {
-                window.wantsMouseMove = true;
-            }
 
             normalTexture = (Texture)AssetDatabase.LoadAssetAtPath("Assets/Editor Default Resources/fs_unityscenetools/normal_40x40.png", typeof(Texture));
             pressedTexture = (Texture)AssetDatabase.LoadAssetAtPath("Assets/Editor Default Resources/fs_unityscenetools/pressed_40x40.png", typeof(Texture));
@@ -130,8 +123,7 @@ void Awake()
         }
 
         private void OnGUI() {
-            // force repaint window on mouse move so hover image states work correctly
-            if (Event.current.type == EventType.MouseMove) Repaint();
+            forceRepaint();
 
             if (verticalLayoutDirection)
             {
@@ -319,5 +311,12 @@ private void OnGUI() {
             }
             GUILayout.EndArea();
         }
+
+        private void forceRepaint()
+        {
+            // force repaint window on mouse move so hover image states work correctly
+            var window = GetWindow<FS_UnitySceneTools>();
+            if (Event.current.type == EventType.MouseMove) Repaint();
+        }
     }
 }