Merge remote-tracking branch 'monkeyfirst/fixed-event-handlers-4-b.mode'

bin/Data/Scripts/Editor/EditorLayers.as

@@ -42,6 +42,10 @@ void CreateLayerEditor()
             bits[i].vars["index"] = i;
             SubscribeToEvent(bits[i], "Toggled", "ToggleBits");
     }
+    
+    SubscribeToEvent("MouseMove", "HandleHideLayerEditor");
+    SubscribeToEvent("MouseButtonDown", "HandleHideLayerEditor");
+    SubscribeToEvent("MouseWheel", "HandleMaskTypeScroll");
 }
 
 bool ShowLayerEditor()
@@ -55,7 +59,7 @@ bool ShowLayerEditor()
     patternMaskNode = node;
     
     // just change position if already opened
-    if ( layerWindow.visible == true )
+    if (layerWindow.visible == true)
     {
         HideLayerEditor();
         /*
@@ -79,12 +83,7 @@ bool ShowLayerEditor()
     layerWindowPosition.x += layerWindow.width / 2;
     layerWindow.visible = true;
     layerWindow.BringToFront();
-    
-    // Subscribe while window are visible
-    SubscribeToEvent("MouseMove", "HandleHideLayerEditor");
-    SubscribeToEvent("MouseButtonDown", "HandleHideLayerEditor");
-    SubscribeToEvent("MouseWheel", "HandleMaskTypeScroll");
-     
+
     return true;
 }
 
@@ -136,7 +135,7 @@ void EstablishSelectedNodeBitMaskToPanel()
     }
 }
 
-void SetupBitsPanel( int mask ) 
+void SetupBitsPanel(int mask) 
 {
     for (int i = 0; i < 8; i++) 
     {
@@ -275,7 +274,7 @@ void HandleHideLayerEditor(StringHash eventType, VariantMap& eventData)
             HideLayerEditor();
     } 
     // if user click on scene - close layser window
-    else if ( eventType == eventTypeMouseButtonDown ) 
+    else if (eventType == eventTypeMouseButtonDown) 
     {
         if (ui.focusElement is null) 
         {