Changeset 12610

Timestamp:

07/06/15 15:52:06 (9 years ago)

Author:

ascheibe

Message:

#2358 merged r12181 and r12182 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (5 diffs)

stable/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

@@ -32 +32 @@
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Persistence.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
@@ -236 +237 @@
       if (!(item.Value is IDeepCloneable)) return;
       var data = new DataObject(HeuristicLab.Common.Constants.DragDropDataFormat, item);
-      DoDragDrop(data, DragDropEffects.Copy);
+      DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
     }
     protected virtual void variableListView_DragEnter(object sender, DragEventArgs e) {
@@ -252 +253 @@
       e.Effect = DragDropEffects.None;
       if (validDragOperation) {
-        if (e.AllowedEffect.HasFlag(DragDropEffects.Copy))
-          e.Effect = DragDropEffects.Copy;
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
+        else if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
+        else if (e.AllowedEffect.HasFlag(DragDropEffects.Link)) e.Effect = DragDropEffects.Link;
       }
     }
     protected virtual void variableListView_DragDrop(object sender, DragEventArgs e) {
-      if (e.Effect != DragDropEffects.Copy) return;
+      if (e.Effect == DragDropEffects.None) return;
+
       object item = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
 
@@ -278 +281 @@
       if (cloneable == null) return;
 
-      var clonedItem = cloneable.Clone();
-      Content.Add(variableName, clonedItem);
+      Content.Add(variableName, e.Effect.HasFlag(DragDropEffects.Copy) ? cloneable.Clone() : cloneable);
 
       var listViewItem = variableListView.FindItemWithText(variableName);
@@ -474 +476 @@
       if (variable.Value != null) {
         type = variable.Value.GetType();
-        if (serializableLookup.TryGetValue(type, out serializable))
-          return serializable;
+        if (serializableLookup.TryGetValue(type, out serializable)) return serializable;
+        if (StorableClassAttribute.IsStorableClass(type)) return serializableLookup[type] = true;
       }